Changeset 77c3523 in tol

Timestamp:

Apr 13, 2009, 7:26:21 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

75b716c

Parents:

a2a1c99

Message:

Simplifying behaviour of method draw

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

Location:

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs

Files:

• _arimaBlock.tol (modified) (2 diffs)
• _nonLinBlock.tol (modified) (2 diffs)
• _sigmaBlock.tol (modified) (2 diffs)
• _stdLinearBlock.tol (modified) (1 diff)

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_arimaBlock.tol

@@ -579 +579 @@
     Matrix values = SetCol(arma.draw.all);
   //WriteLn("TRACE"+_MID+" draw 3 "<<Matrix Tra(values));
-    Real Do setStore(values);
-    Copy(_.store)
+    Mat2VMat(values)
   };
 
@@ -602 +601 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-  //WriteLn("TRACE"+_MID+" draw 1 ");
-    If(And(enabled, numSim%_skipIter==0),
-    {
-    //WriteLn("TRACE"+_MID+" draw 2 ");
-      draw.scalar(numSim, _.ws::noise, _.ws::sigma.full)
-    },
-    {
-      Copy(_.store)
-    })
+    draw.scalar(numSim, _.ws::noise, _.ws::sigma.full)
   };
 

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_nonLinBlock.tol

@@ -230 +230 @@
   //WriteLn("TRACE"+_MID+"draw.scalar 3");
   //Real show.arma(0);
-    Real Do setStore(SetCol(draw.all));
-    Copy(_.store)
+    Mat2VMat(SetCol(draw.all))
   };
 
@@ -249 +248 @@
   {
   //WriteLn("TRACE"+_MID+"draw 1");
-    If(enabled,
-    {
-      draw.scalar(numSim)
-    },
-    {
-      Copy(_.store) 
-    })
+    draw.scalar(numSim)
   };
 

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_sigmaBlock.tol

@@ -153 +153 @@
       })
     });
-  //WriteLn("TRACE "+_MID+" draw.invRandChisq 3 ");
-    Real Do setStore(SetCol(v));
-  //WriteLn("TRACE "+_MID+" draw.invRandChisq 4 ");
-    Copy(_.store)
+    Mat2VMat(SetCol(v))
   };
 
@@ -177 +174 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    If(enabled,
-    {
-      draw.invRandChisq(numSim, _.ws::residuals)
-    },
-    {
-      Copy(_.store)
-    })
+    draw.invRandChisq(numSim, _.ws::residuals)
   };
 

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_stdLinearBlock.tol

@@ -434 +434 @@
   {
   //WriteLn("TRACE "+_MID+" draw 1");
-    VMatrix b = If(Not(enabled), _.store,
-    {
-    //WriteLn("TRACE "+_MID+" draw 3");
-      Real _.calculatedSimulation := _.calculatedSimulation+1;
-    //WriteLn("TRACE "+_MID+" draw 4");
-      If(And(_.calculatedSimulation >_.MH.useAfterIter,
-             _.MH.consecutive <= _.MH.maxConsecutive),
-        draw.mh   (numSim),
-        draw.gibbs(numSim))
-    });
-    Real putStoreV(b);
-    _.store
+    Real _.calculatedSimulation := _.calculatedSimulation+1;
+  //WriteLn("TRACE "+_MID+" draw 4");
+    If(And(_.calculatedSimulation >_.MH.useAfterIter,
+           _.MH.consecutive <= _.MH.maxConsecutive),
+       draw.mh   (numSim),
+       draw.gibbs(numSim))
   }