Changeset 500724a in tol

Timestamp:

Sep 24, 2009, 11:04:26 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

be10b0b

Parents:

e658f6d

Message:

Preparing for new modular parser

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

File:

• tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_basicMaster.tol (modified) (5 diffs)

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

@@ -25 +25 @@
   //Non linear blocks
   Set _.nonLinBlk;
-  //Non linear filter of output
-  Set _.nonLinOutputFilter;
 
   //--------------------------------------------------------------------------
@@ -43 +41 @@
   //Linear block values
   VMatrix _.beta = Rand(0,1,0,0);
+  //Non linear filter of output
+  Set _.nonLinOutputFilter = Copy(Empty);
+  //Non linear filters with parameters to be drawn
+  Set _.nonLinDrawFilter = Copy(Empty);
 
   //--------------------------------------------------------------------------
@@ -207 +209 @@
     Set _.nonLinOutputFilter := Select(_.nonLinBlk, sel.extFlt);
 
+    Real sel.drwFlt (BysMcmc::BlockSampler nlb) { nlb::_.N>0 };
+    Set _.nonLinDrawFilter := Select(_.nonLinBlk, sel.drwFlt);
+
   //WriteLn("TRACE"+_MID+" initialize 1");
     VMatrix _.YplusV := _.outMis.blk::filter(_.Y);
@@ -376 +381 @@
       _.mln.blk::get.draw(numSim, False)
     });
-    Set nlb.aux = EvalSet(_.nonLinBlk, VMatrix(BlockNonLin nlb)
-    {
-      nlb::get.draw(numSim,False)
+    VMatrix nlb = If(!Card(_.nonLinBlk),Rand(0,1,0,0),
+    {
+      Set nlb.aux = EvalSet(_.nonLinBlk, VMatrix(BlockNonLin nlb)
+      {
+        nlb::get.draw(numSim,False)
+      });
+      Group("ConcatRows", nlb.aux)
     }); 
-    VMatrix nlb = Group("ConcatRows", nlb.aux);
   //WriteLn("TRACE"+_MID+" MasterSamplerBasic::draw 6 _.beta="<<_.beta);
     VMatrix param = _.beta << sig << arm << im << om << nlb;
@@ -852 +860 @@
       //Internal reference to model definition
       Set _.modelDef = modelDef;
-      //External filter of output
-      Set _.nonLinOutputFilter = Copy(Empty);
       //Output after external filters
       VMatrix _.Y = _.modelDef->Y;