Changeset 077124f in tol

Timestamp:

Sep 17, 2009, 2:07:43 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

90b9e0c

Parents:

abce44f

Message:

Using Pol2VMat instead of PolMat

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

File:

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

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

@@ -176 +176 @@
     VMatrix D = 
     {
-      Matrix aux1 = PolMat(dif,m,m);
-      Rand(difDegree,m,0,0) <<
-      Mat2VMat(SubRow(aux1, Range(difDegree+1,m,1)),0,0.25,1.E-10)
+      VMatrix aux1 = Pol2VMat(dif,m,m);
+      Zeros(difDegree,m) <<
+      SubRow(aux1, Range(difDegree+1,m,1))
     };
   //WriteLn("TRACE"+_MID+" initializeArimaBlock before _.difFilter:"<<_.difFilter);
@@ -487 +487 @@
   ////////////////////////////////////////////////////////////////////////////
   {
+  //WriteLn("TRACE"+_MID+" filter.arma 1 DX="<< DX);
     Set s = EvalSet(_.armaParamBlock, Set set.filterArima(BSR.NoiseDistrib segment)
     {
-      VMatrix aux1 = filterJustBlock(segment,SubRow(DX, segment->EquIdx));
+    //WriteLn("TRACE"+_MID+" filter.arma 2 segment="<< segment->Name);
+      VMatrix DXs = SubRow(DX, segment->EquIdx);
+    //WriteLn("TRACE"+_MID+" filter.arma 3 DXs="<< DXs);
+      VMatrix aux1 = filterJustBlock(segment,DXs);
+    //WriteLn("TRACE"+_MID+" filter.arma 4 aux1="<< aux1);
       [[aux1, (segment->ArimaAuxInfo)::equIdxVec]]
     });
+  //WriteLn("TRACE"+_MID+" filter.arma 5");
     MergeRows(_.m, s)
   };