Changeset abef005 in tol

Timestamp:

Oct 9, 2009, 9:09:14 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

eb3f09b

Parents:

99bfca9

Message:

Working with common input missing

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

File:

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

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

@@ -13 +13 @@
   // Mandatory members
   //--------------------------------------------------------------------------
+  //Classification of missing by name
+  Set _.inputMissingDistinct;
+  //Index of store position of each missing
+  Set _.storeIndex;
   //Input missing pairs (equation,variable)
   Matrix _.tj;
@@ -62 +66 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-  //WriteLn("TRACE"+_MID+" @BlockInputMissing::_buildWorkSpace 0");
+  //WriteLn("TRACE"+_MID+" _buildWorkSpace 1 beta="<<VMat2Mat(beta));
     Real    M = VRows(Z);
     VMatrix b_= SubRow(beta, _.j);
     Matrix  b = VMat2Mat(b_);
-  //WriteLn("TRACE "+_MID+" draw 2 b="<<b);
+  //WriteLn("TRACE "+_MID+" _buildWorkSpace 2 b="<<b);
     VMatrix B = (Convert(Triplet(_.tk | b, M, _.N),"Cholmod.R.Sparse"));
-  //WriteLn("TRACE "+_MID+" draw 3 B="<<B);
+  //WriteLn("TRACE "+_MID+" _buildWorkSpace 3 B="<<VMat2Mat(B));
     BysMcmc::Bsr::Gibbs::@WorkSpace.LinReg wslr = 
     [[
       VMatrix _.Y = arm.blk::filter(si*Z) << _.prior.Y;
-  //WriteLn("TRACE "+_MID+" draw 4 Y01="<<Y01);
       VMatrix _.X = arm.blk::filter(si*B) << _.prior.X
     ]];
+  //WriteLn("TRACE "+_MID+" _buildWorkSpace 4 ");
     BysMcmc::Bsr::Gibbs::@WorkSpace.LinReg _.ws := wslr;
     True
@@ -87 +91 @@
   ////////////////////////////////////////////////////////////////////////////
   {
+  //WriteLn("TRACE "+_MID+" _buildWorkSpace_partial 1");
     VMatrix If(VRows(_.prior.X.free)==0,
     {
@@ -140 +145 @@
   //WriteLn("TRACE "+_MID+" initialize 1");
   //WriteLn("TRACE "+_MID+" 7");
-    VMatrix u = _.store;
+    VMatrix store = _.store;
     //Selecting input missing variables with left truncated prior information
     Set leftConstrainedPrior.sel = 
@@ -190 +195 @@
     });
   //WriteLn("TRACE "+_MID+" initialize 4");
-    Real ok = matchConstrains(u,prior.A,prior.a);
+    Real ok = matchConstrains(store,prior.A,prior.a);
   //WriteLn("TRACE "+_MID+" initialize 5");
     ok
@@ -203 +208 @@
   ////////////////////////////////////////////////////////////////////////////
   {
+  //WriteLn("TRACE "+_MID+" filter 1");
     If(Not(enabled), Z,
     {
-      Matrix tr = _.tj | VMat2Mat(_.store);
-      VMatrix U =Triplet(tr,VRows(Z),VColumns(Z));
+    //WriteLn("TRACE "+_MID+" filter 2");
+      VMatrix u = SubRow(_.store, _.storeIndex);
+      Matrix tr = _.tj | VMat2Mat(u);
+      VMatrix U = Triplet(tr,VRows(Z),VColumns(Z));
       Z+Convert(U,"Cholmod.R.Sparse")
     })
@@ -229 +237 @@
     BysMcmc::Bsr::Gibbs::@BlockInputMissing blk = [[
     Code _.buildWorkSpace = _buildWorkSpace;
+    Set _.inputMissingDistinct = 
+    {
+      Set aux = Classify(inputMissingBlock, 
+      Real(@BSR.MissingBlock a, @BSR.MissingBlock b)
+      {
+        Compare(a->Name, b->Name)
+      });
+      Set For(1, Card(aux), Real(Real k)
+      { 
+        Set EvalSet(aux[k], Real(@BSR.MissingBlock mis)
+        {
+          Real mis->Index := k
+        });
+        k
+      });
+      aux
+    };
+    Set _.storeIndex = EvalSet(inputMissingBlock, 
+     Real(@BSR.MissingBlock mis){ mis->Index }), 
     //Given initial values of block variables
-    VMatrix _.store = Mat2VMat(SetMat(Extract(inputMissingBlock, 6)));
+    VMatrix _.store = Mat2VMat(SetMat(
+       EvalSet(_.inputMissingDistinct, Set(Set cl){ [[(cl[1])->Nu]] })));
     //Defining the block in the Markov Chain
     Real _defined = define(
       name, 
-      EvalSet(inputMissingBlock, Text(@BSR.MissingBlock b){ b->Name }), 
+      EvalSet(_.inputMissingDistinct, Text(Set cl){ (cl[1])->Name }), 
       mcmcPartialHandler,
       numBlock, 
@@ -253 +281 @@
     Set _.j = Traspose(Extract(inputMissingBlock, 4))[1];
     //Selecting input missing variables with prior information
-    Set _.prior.sel = Select(inputMissingBlock, Real(@BSR.MissingBlock b)
-    {
-      b->Prior != "None"
-    });
+    Set _.prior.sel = 
+    {
+      Set aux = EvalSet(_.inputMissingDistinct, Set(Set cl){ cl[1] });
+      Select(aux, Real(@BSR.MissingBlock b)
+      {
+        b->Prior != "None"
+      })
+    };
     //Number of input missing prior equations
     Real _.prior.M = Card(_.prior.sel);