Changeset d3aa758 in tol

Timestamp:

Oct 26, 2008, 10:55:07 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

a0a6906

Parents:

686f33d

Message:

Preparing for non parametric filters

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

File:

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

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

@@ -68 +68 @@
     ((_.bsr::_.modelDef)->NoiseDistrib)[_.segmentNum]
   });
+  //Non linear parameters
+  Set _.colNames = _.filterEval::get.colNames(0);
   //Number of non linear parameters
-  Set _.colNames = _.filterEval::get.colNames(0);
+  Real _.numVar = Card(_.colNames); 
   //For input filters is +1, for output ones -1
   Real _.isInputFilter = If(FunctionExist("Set","_.filterEval::get.linBlkNames"),
@@ -272 +274 @@
     {
     //WriteLn("TRACE"+_MID+"draw 2");
-      draw.scalar(numSim, False)
+      If(_.blockDef::_.numCol==0,
+      {
+        Real setStore(_.blockDef::_.store);
+        _.blockDef::_.store
+      },
+      {
+        draw.scalar(numSim, False)
+      })
     },
     {
@@ -311 +320 @@
   {
   //WriteLn("TRACE "+_MID+"::setStore 1 values("<<Rows(values)+"x"<<Columns(values)+")");
-    If(_.blockDef::_.numCol<=0,0,
+    Real If(_.blockDef::_.numCol==0,0,
     {
     //WriteLn("TRACE "+_MID+"::setStore 2");
-      Real _.blockDef::setStore(values);
+      Real _.blockDef::setStore(values)
+    });
     //WriteLn("TRACE "+_MID+"::setStore 3");
-      Matrix _.Fi := _.filterEval::eval(VMat2Mat(_.blockDef::_.store));
+    Matrix _.Fi := _.filterEval::eval(VMat2Mat(_.blockDef::_.store));
     //WriteLn("TRACE "+_MID+"::setStore 4");
-      If(!_.isInputFilter, 0,
-      {
-        SetMin(For(1,_.filterColNum,Real(Real column)
-        {
-          _.bsr::setSegmentInputCol(
-            SubCol(_.Fi,[[column]]),
-            _.segmentNum, 
-            _.filterColIdx[column])
-        }))
-      })
+    If(!_.isInputFilter, 0,
+    {
+      SetMin(For(1,_.filterColNum,Real(Real column)
+      {
+        _.bsr::setSegmentInputCol(
+          SubCol(_.Fi,[[column]]), _.segmentNum, _.filterColIdx[column])
+      }))
     })
   };