Changeset 40b58f9 in tol for tol/stdlib/math/stat/models/bayesian/bysMcmc/_partialSampler.tol

Timestamp:

Sep 3, 2009, 10:42:50 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

e7e91d9

Parents:

f16fdcd

Message:

Ensuring that all members are well initialized at method build in all possible cases

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1322 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/stdlib/math/stat/models/bayesian/bysMcmc/_partialSampler.tol (modified) (3 diffs)

tol/stdlib/math/stat/models/bayesian/bysMcmc/_partialSampler.tol

@@ -169 +169 @@
   ////////////////////////////////////////////////////////////////////////////
   {
+  //WriteLn("TRACE BlockPartialSampler::build 1");
     Real _.N := Card(blockParam);
     BysMcmc::McmcPartialHandler _.mcmcPartialHandler := mcmcPartialHandler;
     Set fixedParamIdx = Copy(Empty);
     Set reloadParamIdx = Copy(Empty);
+    Real   _.fixedParamNum  := 0;
+    Real   _.reloadParamNum := 0;
+    Real   _.freeParamNum   := 0;
+    Matrix _.fixedParamIdx  := Rand(0,1,0,0);
+    Matrix _.reloadParamIdx := Rand(0,1,0,0);
+    Matrix _.freeParamIdx   := Rand(0,1,0,0);
+    Set    _.fixedParam     := Copy(Empty);
+    Set    _.reloadParam    := Copy(Empty);
+    Set    _.freeParam      := Copy(Empty);
+    Set    _.reloadParamIdxOrig := Copy(Empty);
     If(!_.N,
     {
-      Matrix _.fixedParamIdx  := Rand(0,1,0,0);
-      Matrix _.reloadParamIdx := Rand(0,1,0,0);
-      Matrix _.freeParamIdx   := Rand(0,1,0,0);
-      Set    _.fixedParam     := Copy(Empty);
-      Set    _.reloadParam    := Copy(Empty);
-      Set    _.freeParam      := Copy(Empty);
-      Real   _.fixedParamNum  := 0;
-      Real   _.reloadParamNum := 0;
-      Real   _.freeParamNum   := 0;
       1
     },
@@ -191 +193 @@
         Set   fixedParamAll  = _.mcmcPartialHandler::_.fixedParam;
         Set   fixedParamAux  = SelectIndexByName(blockParam, fixedParamAll);
-        Set _.fixedParam    := ExtractByIndex(fixedParamAll, fixedParamAux);
-        Real SetIndexByName(_.fixedParam);
-        Set fixedParamIdx := SelectIndexByName(_.fixedParam, blockParam);
-        Matrix _.fixedParamIdx := SetCol(fixedParamIdx);
-        1 
+        Real If(!Card(fixedParamAux), 
+        {
+          Set _.fixedParam    := ExtractByIndex(fixedParamAll, fixedParamAux);
+          Real SetIndexByName(_.fixedParam);
+          Set fixedParamIdx := SelectIndexByName(_.fixedParam, blockParam);
+          Matrix _.fixedParamIdx := SetCol(fixedParamIdx);
+          1 
+        })
       });
       Real If(Card(_.mcmcPartialHandler::_.reloadParam), 
@@ -201 +206 @@
         Set   reloadParamAll  = _.mcmcPartialHandler::_.reloadParam;
         Set   reloadParamAux  = SelectIndexByName(blockParam, reloadParamAll);
-        Set _.reloadParam    := ExtractByIndex(reloadParamAll, reloadParamAux);
-        Real SetIndexByName(_.reloadParam);
-        Set reloadParamIdx := SelectIndexByName(_.reloadParam, blockParam);
-        Matrix _.reloadParamIdx := SetCol(reloadParamIdx);
-        Set _.reloadParamIdxOrig := 
-         _.mcmcPartialHandler::_.reloader::selectIndexes(_.reloadParam);
-        1 
+        Real If(Card(reloadParamAux), 
+        {
+          Set _.reloadParam    := ExtractByIndex(reloadParamAll, reloadParamAux);
+          Real SetIndexByName(_.reloadParam);
+          Set reloadParamIdx := SelectIndexByName(_.reloadParam, blockParam);
+          Matrix _.reloadParamIdx := SetCol(reloadParamIdx);
+          Set _.reloadParamIdxOrig := 
+           _.mcmcPartialHandler::_.reloader::selectIndexes(_.reloadParam);
+          1 
+        })
       });
       Set freeParamIdx = Range(1,_.N,1)-(fixedParamIdx << reloadParamIdx);