Changeset ff5d8e2 in tol

Timestamp:

Dec 17, 2009, 3:05:07 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

945ef38

Parents:

0d654d6

Message:

Fixed #814

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

Location:

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

Files:

• _basicMaster.tol (modified) (4 diffs)
• _nonLinBlock.tol (modified) (1 diff)

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

@@ -75 +75 @@
       Real filter.blk(BysMcmc::@BlockSampler extFlt)
       {
-        extFlt::do.filter(_.Y)
+        Real ok = extFlt::do.filter(_.Y);
+      //WriteLn("TRACE"+_MID+"DoNonLinOutputFilter 4 _.Y=\n"<<VMat2Mat(_.Y,1));
+        ok
       };
       SetMin(EvalSet(_.nonLinOutputFilter,filter.blk))
@@ -149 +151 @@
   ////////////////////////////////////////////////////////////////////////////
   {
+  //WriteLn("TRACE"+_MID+" define.all 0");
     Set _.nonLinBlk := 
     {
@@ -202 +205 @@
   {
   //WriteLn("TRACE"+_MID+" initialize 0");
+    Matrix givenBeta=
+    SetCol(EvalSet(_.modelDef->LinearBlock,Real(@BSR.LinearBlock b)
+    { b->InitialValue }));
+    VMatrix beta0 = findMatchingBeta(Mat2VMat(givenBeta));
+    VMatrix _.filter := _.modelDef->X*beta0;
     Real initialize.blocks(unused);
-
+  //WriteLn("TRACE"+_MID+"initialize _.filter=\n"<<Matrix VMat2Mat(_.filter,1));
     Real sel.extFlt (BysMcmc::@BlockSampler nlb) { !(nlb::_.isInputFilter) };
     Set _.nonLinOutputFilter := Select(_.nonLinBlk, sel.extFlt);
@@ -215 +223 @@
     VMatrix _.XplusU := _.mis.blk::filter.input(_.modelDef->X);
   //WriteLn("TRACE"+_MID+" initialize 1.2 _.XplusU("<<VRows(_.XplusU)+"x"<<VColumns(_.XplusU)+")");
-    Matrix givenBeta=
-    SetCol(EvalSet(_.modelDef->LinearBlock,Real(@BSR.LinearBlock b)
-    { b->InitialValue }));
-    VMatrix beta0 = findMatchingBeta(Mat2VMat(givenBeta));
   //WriteLn("TRACE"+_MID+" initialize 3 beta0("<<VRows(beta0)+"x"<<VColumns(beta0)+")");
     Real ok = _.mln.blk::matchConstrains(beta0, _.modelDef->A, _.modelDef->a);

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

@@ -243 +243 @@
   //WriteLn("TRACE "+_MID+"::setStore 1 values("<<Rows(values)+"x"<<Columns(values)+")");
     Real putStore(values);
+  //WriteLn("TRACE "+_MID+"::setStore 3");
+    Matrix _.Fi := _.filter::eval(VMat2Mat(_.store));
+  //WriteLn("TRACE "+_MID+"::setStore 3.1");
     Real If(_.N==0, True,
     {
-    //WriteLn("TRACE "+_MID+"::setStore 3");
-      Matrix _.Fi := _.filter::eval(VMat2Mat(_.store));
     //WriteLn("TRACE "+_MID+"::setStore 4");
       Real ok = If(!_.isInputFilter, 0,