Changeset 824d400 in tol

Timestamp:

Aug 25, 2009, 11:35:32 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

d8928a5

Parents:

6be9c2a

Message:

Method build must set all to zero or empty when _.N==0

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

File:

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

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

@@ -165 +165 @@
     Set fixedParamIdx = Copy(Empty);
     Set reloadParamIdx = Copy(Empty);
-    If(_.N,
+    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
+    },
     {
       Real If(Card(_.mcmcPartialHandler::_.fixedParam), 
@@ -189 +201 @@
         1 
       });
+      Set freeParamIdx = Range(1,_.N,1)-(fixedParamIdx << reloadParamIdx);
+      Matrix _.freeParamIdx := SetCol(freeParamIdx);
+      Set _.freeParam := ExtractByIndex(blockParam, freeParamIdx);
+      Real _.fixedParamNum  := Rows(_.fixedParamIdx);
+      Real _.reloadParamNum := Rows(_.reloadParamIdx);
+      Real _.freeParamNum   := Rows(_.freeParamIdx);
+      VMatrix If(_.fixedParamNum | _.reloadParamNum,
+      {
+        getMergedFixedAndReloadedSample(0)
+      });
       1
-    });
-    Set freeParamIdx = Range(1,_.N,1)-(fixedParamIdx << reloadParamIdx);
-    Matrix _.freeParamIdx := SetCol(freeParamIdx);
-    Set _.freeParam := ExtractByIndex(blockParam, freeParamIdx);
-    Real _.fixedParamNum  := Rows(_.fixedParamIdx);
-    Real _.reloadParamNum := Rows(_.reloadParamIdx);
-    Real _.freeParamNum   := Rows(_.freeParamIdx);
-    VMatrix If(_.fixedParamNum | _.reloadParamNum,
-    {
-      getMergedFixedAndReloadedSample(0)
-    });
-    1
+    })
   };