Changeset 9eb6966 in tol

Timestamp:

Apr 28, 2009, 2:59:59 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

eecdfc0

Parents:

035f7aa

Message:

Fixes #688

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

File:

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

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

@@ -85 +85 @@
     0
   });
+  //Optional filter method to be called before to call draw.scalar
+  //This method will be called just before to call draw method of corresponding 
+  //internal non linear block in order to select which parameters will be drawn. 
+  //Rest of parameters must be set inside of method selectDrawIndex.
+  //Set selectDrawIndex(Real unused)
+  Code _.selectDrawIndex = If(FunctionExist("Real","_.filterEval::selectDrawIndex"),
+  {
+    WriteLn(_MID+"Using specified selectDrawIndex method");
+    _.filterEval::selectDrawIndex
+  },
+  {
+    WriteLn(_MID+"Using default selectDrawIndex method");
+    Set (Real unused) { Range(1,Card(_.colNames),1) } 
+  });
+  //Optional filter method that returns log of prior density for one parameter
+  //Real get.priorLogDens(Real paramIdx)
   Code _.get.priorLogDens = If(FunctionExist("Real","_.filterEval::get.priorLogDens"),
     _.filterEval::get.priorLogDens,
@@ -152 +168 @@
   //WriteLn("TRACE"+_MID+"draw.scalar 1.6 d="<<d+" p="<<p+" q="<<q+" m="<<m+" n="<<n);
   //WriteLn("TRACE"+_MID+"draw.scalar 2");
-    Set draw.all = For(1,Card(_.colNames), 
-    Real scalar.draw.one(Real i)
+    Set drawIndex = _.selectDrawIndex(0);
+    Set draw.all = EvalSet(drawIndex, Real scalar.draw.one(Real i)
     {
     //WriteLn("TRACE"+_MID+"draw.scalar.one 2.["+IntText(i)+"].1");