Changeset e2ecdcf in tol

Timestamp:

Oct 23, 2008, 8:41:03 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

5c3d5b2

Parents:

df1ac43

Message:

Replacing _.signNoise by flag _.isInputFilter

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

File:

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

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

@@ -71 +71 @@
   Set _.colNames = _.filterEval::get.colNames(0);
   //For input filters is +1, for output ones -1
-  Real _.signNoise = If(!FunctionExist("Set","_.filterEval::get.linBlkNames"),
-  {
-    -1
+  Real _.isInputFilter = If(FunctionExist("Set","_.filterEval::get.linBlkNames"),
+  {
+    If(Card(_.filterEval::get.linBlkNames(0)),1,0)
   },
   {
-    If(Card(_.filterEval::get.linBlkNames(0)),1,-1)
+    0
   });
   //Names of affected parameters in linear block 
   //(just for input filters)
-  Set _.linBlkNames = If(Eq(_.signNoise,-1), Copy(Empty),
+  Set _.linBlkNames = If(!_.isInputFilter, Copy(Empty),
   {
     _.filterEval::get.linBlkNames(0)
@@ -86 +86 @@
   //Positions of columns of affected parameters in linear block 
   //(just for input filters)
-  Set _.filterColIdx = If(Eq(_.signNoise,-1), Copy(Empty),
+  Set _.filterColIdx = If(!_.isInputFilter, Copy(Empty),
   {
     _.bsr::_.lin.blk::_.blockDef::getStoreColIndexes(_.linBlkNames)
@@ -130 +130 @@
     NameBlock sigBlk    = _.bsr::_.sig.blk;
     Matrix u = VMat2Mat(_.blockDef::_.store);
-  //WriteLn("TRACE"+_MID+"draw.scalar 1.1 _.signNoise = "<<_.signNoise);
-    Matrix omega= If(Eq(_.signNoise,-1), Col(1),
+  //WriteLn("TRACE"+_MID+"draw.scalar 1.1 _.isInputFilter = "<<_.isInputFilter);
+    Matrix omega= If(!_.isInputFilter, Col(1),
       SubRow(VMat2Mat(_.bsr::_.lin.blk::_.blockDef::_.store), 
                          _.filterColIdx));
@@ -138 +138 @@
     Matrix _.W := VMat2Mat(SubRow(fullNoise,_.segment->EquIdx));
   //WriteLn("TRACE"+_MID+"draw.scalar 1.4 _.W("<<Rows(_.W)+"x"<<Columns(_.W));
-    Matrix _.Z := _.W *_.signNoise + _.Fi * omega;
+    Matrix _.Z := _.W + _.Fi * omega;
   //WriteLn("TRACE"+_MID+"draw.scalar 1.5 _.Z("<<Rows(_.Z)+"x"<<Columns(_.Z));
     Set aux = _.segment->ArimaAuxInfo;
@@ -318 +318 @@
       Matrix _.Fi := _.filterEval::eval(VMat2Mat(_.blockDef::_.store));
     //WriteLn("TRACE "+_MID+"::setStore 4");
-      If( _.signNoise == -1, 0,
+      If(!_.isInputFilter, 0,
       {
         SetMin(For(1,_.filterColNum,Real(Real column)