Changeset 40668f6 in tol

Timestamp:

Sep 11, 2009, 2:58:33 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

b19979f

Parents:

f57fe71

Message:

Fixed bug in getMergedFixedAndReloadedSample

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

File:

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

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

@@ -147 +147 @@
   VMatrix _.fixedValues = Rand(0,1,0,0);
   //Stores values of reloaded parameters in natural order
-  VMatrix _.reloadedValues = Rand(0,1,0,0);
+  VMatrix _.reloadValues = Rand(0,1,0,0);
   //Stores values of both fixed and reloaded parameters in the block order
   VMatrix _.values = Rand(0,1,0,0);
+  VMatrix _.nonFreeValues = Rand(0,1,0,0);
+
+  Set _.nonFreeIndex = Copy(Empty);
+  Set _.freeIndex = Copy(Empty);
 
 
@@ -220 +224 @@
       Real _.reloadParamNum := Rows(_.reloadParamIdx);
       Real _.freeParamNum   := Rows(_.freeParamIdx);
-      VMatrix If(_.fixedParamNum | _.reloadParamNum,
+      Real If(_.fixedParamNum | _.reloadParamNum,
       {
         getMergedFixedAndReloadedSample(0)
       });
       1
-    })
+    });
+    Set _.nonFreeIndex := MatSet(Tra(_.fixedParamIdx << _.reloadParamIdx))[1];
+    Set _.freeIndex := MatSet(Tra(_.freeParamIdx))[1];
+    1
   };
 
@@ -232 +239 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-     MatSet(Tra(_.fixedParamIdx << _.reloadParamIdx))[1]
+    _.nonFreeIndex
   };
 
@@ -239 +246 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-     MatSet(Tra(_.freeParamIdx))[1]
-  };
-
-
-  ////////////////////////////////////////////////////////////////////////////
-  VMatrix getMergedFixedAndReloadedSample(Real numSim)
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    VMatrix _.reloadedValues := _.mcmcPartialHandler::_.reloader::
+    _.freeIndex
+  };
+
+
+  ////////////////////////////////////////////////////////////////////////////
+  Real getMergedFixedAndReloadedSample(Real numSim)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+  //WriteLn("TRACE"+_MID+" BlockPartialSampler::getMergedFixedAndReloadedSample 0");
+    VMatrix _.reloadValues := _.mcmcPartialHandler::_.reloader::
      reloadSimulation(numSim, _.reloadParamIdxOrig);
-    VMatrix _.values := Case(
-    _.N==_.fixedParamNum, 
-    {
-      _.fixedValues
+  //WriteLn("TRACE"+_MID+" _.fixedValues:"<<_.fixedValues);
+  //WriteLn("TRACE"+_MID+" _.reloadValues:"<<_.reloadValues);
+    VMatrix values = Case(
+    !_.fixedParamNum, 
+    {
+      MergeRows(_.N, [[
+        [[_.reloadValues, _.reloadParamIdx]] ]])
     },
-    _.N==_.reloadParamNum, 
-    {
-      _.reloadedValues
+    !_.reloadParamNum, 
+    {
+      MergeRows(_.N, [[
+        [[_.fixedValues,  _.fixedParamIdx ]] ]])
     },
     1==1,
     {
-      VMatrix values = MergeRows(_.N, [[
-        [[_.fixedValues,    _.fixedParamIdx ]],
-        [[_.reloadedValues, _.reloadParamIdx]] ]]);
-      Convert(values,"Blas.R.Dense")
-    })
+      MergeRows(_.N, [[
+        [[_.fixedValues,  _.fixedParamIdx ]],
+        [[_.reloadValues, _.reloadParamIdx]] ]])
+    });
+    VMatrix _.values := Convert(values,"Blas.R.Dense");
+    VMatrix _.nonFreeValues := SubRow(_.values, _.nonFreeIndex);
+    0
   };
 
@@ -271 +285 @@
   ////////////////////////////////////////////////////////////////////////////
   {
+  //WriteLn("TRACE"+_MID+" BlockPartialSampler::getMergedFixedAndReloadedSample 0");
+  //WriteLn("TRACE"+_MID+" _.fixedValues:"<<_.fixedValues);
+  //WriteLn("TRACE"+_MID+" _.fixedParamIdx:"<<_.fixedParamIdx);
+  //WriteLn("TRACE"+_MID+" _.reloadValues:"<<_.reloadValues);
+  //WriteLn("TRACE"+_MID+" _.reloadParamIdx:"<<_.reloadParamIdx);
+  //WriteLn("TRACE"+_MID+" freeValues:"<<freeValues);
+  //WriteLn("TRACE"+_MID+" _.freeParamIdx:"<<_.freeParamIdx);
     VMatrix values = MergeRows(_.N, [[
-      [[_.fixedValues,    _.fixedParamIdx ]],
-      [[_.reloadedValues, _.reloadParamIdx]],
-      [[  freeValues,     _.freeParamIdx  ]] ]]);
+      [[_.fixedValues,  _.fixedParamIdx ]],
+      [[_.reloadValues, _.reloadParamIdx]],
+      [[  freeValues,   _.freeParamIdx  ]] ]]);
     VMatrix _.values := Convert(values,"Blas.R.Dense")
   }