Changeset 24bdea7 in tol

Timestamp:

Apr 1, 2009, 3:48:09 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

dd921c2

Parents:

90b59de

Message:

Removing max-likelihood step

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

File:

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

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

@@ -259 +259 @@
     VMatrix si = _.sig.blk::_.sigmaInv;
   //WriteLn("TRACE"+_MID+" draw.sig.lin 7");
+/*
     VMatrix Y01 = _.arm.blk::filter(si*_.YplusV); 
   //WriteLn("TRACE"+_MID+" draw.sig.lin 6");
@@ -265 +266 @@
     VMatrix _.beta := If(Not(_.mln.blk::_.N),Rand(0,1,0,0),
       _.mln.blk::draw(numSim, Y01, X01));
+*/
+    VMatrix _.beta := If(Not(_.mln.blk::_.N),Rand(0,1,0,0),
+      _.mln.blk::draw(numSim, si*_.YplusV, si*_.XplusU, _.arm.blk));
   //WriteLn("TRACE"+_MID+" draw.sig.lin 9");
     _.beta << sig << arm << im << om
   };
-
-  ////////////////////////////////////////////////////////////////////////////
-  Text _.autodoc.member.maxLikelihood =
-  "";
-  VMatrix maxLikelihood(Real numIter)
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    Real DoExternalFilter(0);
-    VMatrix om = If(Not(_.outMis.blk::_.blockDef::_.numCol),Rand(0,1,0,0),
-    {
-      _.outMis.blk::maxLikelihood(numSim,_.arm.blk,_.sig.blk::_.sigmaInv,
-                                  _.Y-_.XplusU*_.beta)
-    });
-    VMatrix _.YplusV := _.outMis.blk::filter(_.Y);
-  //WriteLn("TRACE"+_MID+" draw.sig.lin 1.3");
-    VMatrix im = If(Not(_.inpMis.blk::_.blockDef::_.numCol),Rand(0,1,0,0),
-    {
-      _.inpMis.blk::maxLikelihood(numSim,_.arm.blk,_.sig.blk::_.sigmaInv, 
-                                  _.beta, _.YplusV-_.modelDef->X*_.beta)
-    });
-    VMatrix _.XplusU := _.inpMis.blk::filter(_.modelDef->X);
-  //WriteLn("TRACE"+_MID+" draw.sig.lin 1.5");
-    VMatrix _.noise := _.YplusV - _.XplusU*_.beta;
-  //WriteLn("TRACE"+_MID+" draw.sig.lin 2");
-    VMatrix arm = If(Not(_.arm.blk::_.blockDef::_.numCol),Rand(0,1,0,0),
-    _.arm.blk::maxLikelihood(numSim, _.noise, _.sig.blk::_.blockDef::_.store));
-  //WriteLn("TRACE"+_MID+" draw.sig.lin 3");
-    VMatrix e = _.arm.blk::filter(_.noise);
-  //WriteLn("TRACE"+_MID+" draw.sig.lin 4");
-    VMatrix sig = If(Not(_.sig.blk::_.blockDef::_.numCol),Rand(0,1,0,0),
-      _.sig.blk::maxLikelihood(numSim, e))/*_config::mls.FunnelGibbs.sigmaFactor*/;
-  //WriteLn("TRACE"+_MID+" draw.sig.lin 5");
-    VMatrix si = _.sig.blk::_.sigmaInv;
-  //WriteLn("TRACE"+_MID+" draw.sig.lin 7");
-    VMatrix Y01 = _.arm.blk::filter(si*_.YplusV); 
-  //WriteLn("TRACE"+_MID+" draw.sig.lin 6");
-    VMatrix X01 = _.arm.blk::filter(si*_.XplusU); 
-  //WriteLn("TRACE"+_MID+" draw.sig.lin 8");
-    VMatrix _.beta := If(Not(_.mln.blk::_.N),Rand(0,1,0,0),
-      _.mln.blk::maxLikelihood(numSim, Y01, X01));
-  //WriteLn("TRACE"+_MID+" draw.sig.lin 9");
-    _.beta << sig << arm << im << om
-  };
-
-
 
   //--------------------------------------------------------------------------