Changeset 1f99b1c in tol

Timestamp:

Oct 22, 2008, 3:38:45 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

1808425

Parents:

898821f

Message:

Preparing for non linear filers of output

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

Location:

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

Files:

• _basicMaster.tol (modified) (1 diff)
• _nonLinBlock.tol (modified) (1 diff)
• _nonLinMaster.tol (modified) (1 diff)

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

@@ -106 +106 @@
   ////////////////////////////////////////////////////////////////////////////
   {
+  //WriteLn("TRACE"+_MID+"DoExternalFilter 1");
     VMatrix _.Y := _.modelDef->Y;
+  //WriteLn("TRACE"+_MID+"DoExternalFilter 2");
     If(!Card(_.externalFilter), 1,
     {
-      SetMin(EvalSet(_.externalFilter,VMatrix(NameBlock extflt)
-      {
-        extFlt::do.filter(_.Y)
+    //WriteLn("TRACE"+_MID+"DoExternalFilter 3");
+      SetMin(EvalSet(_.externalFilter,Real(NameBlock extFlt)
+      {
+      //WriteLn("TRACE"+_MID+"DoExternalFilter 4 "+extFlt::_.blockDef::_.name);
+        Real ok = extFlt::filter(_.Y);
+      //WriteLn("TRACE"+_MID+"DoExternalFilter 5");
+        ok
       }))
     })

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

@@ -291 +291 @@
 
   ////////////////////////////////////////////////////////////////////////////
-  Real do.filter(VMatrix Y)
-  ////////////////////////////////////////////////////////////////////////////
-  {
+  Real filter(VMatrix Y)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+  //WriteLn("TRACE"+_MID+"do.filter 1");
     Matrix Y_ = VMat2Mat(SubRow(Y,_.segment->EquIdx));
-    PutVMatBlock(Y, (_.segment->EquIdx)[1], 1, Y_-_.Fi)
+  //WriteLn("TRACE"+_MID+"do.filter 2");
+    Matrix Yflt = Y_-_.Fi;
+  //WriteLn("TRACE"+_MID+"do.filter 3");
+    Real ok = PutVMatBlock(Y, (_.segment->EquIdx)[1], 1, Yflt);
+  //WriteLn("TRACE"+_MID+"do.filter 4");
+    ok
   };
 

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

@@ -61 +61 @@
   ////////////////////////////////////////////////////////////////////////////
   {
+    Set _.bsrMst::_.externalFilter := Select(_.nonLinBlk, Real(NameBlock nlb)
+    {
+      EQ(nlb::_.signNoise,-1)
+    });
     Real ok.1 = _.bsrMst::initialize(0);
     Real ok.2 = SetMin(EvalSet(_.nonLinBlk, Real(NameBlock nlb)