Changeset dadf1e9 in tol

Timestamp:

Apr 14, 2009, 1:43:57 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

7f84566

Parents:

b57d0d0

Message:

Preparing hierarchy of classes based on StdLinearBlock

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

Location:

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

Files:

• _inputMissingBlock.tol (modified) (1 diff)
• _mainLinearBlock.tol (modified) (1 diff)
• _outputMissingBlock.tol (modified) (1 diff)
• _stdLinearBlock.tol (modified) (2 diffs)

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

@@ -18 +18 @@
 {
   If(!Card(inputMissingBlock), 
-  BysMcmc::NoBlockSampler(name, Empty, numBlock, firstCol, config),
-  BysMcmc::Bsr::Gibbs::StdLinearBlock blk = [[
+  BysMcmc::Bsr::Gibbs::NoStdLinearBlock(name, Empty, numBlock, firstCol, config),
+  BysMcmc::Bsr::Gibbs::StdLinearFullBlock blk = [[
   //Given initial values of block variables
   VMatrix _.store_ = Mat2VMat(SetMat(Extract(inputMissingBlock, 6)));

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

@@ -28 +28 @@
 {
   If(!Card(varNames), 
-  BysMcmc::NoBlockSampler(name, varNames, numBlock, firstCol, config),
-  BysMcmc::Bsr::Gibbs::StdLinearBlock blk = [[
+  BysMcmc::Bsr::Gibbs::NoStdLinearBlock(name, Empty, numBlock, firstCol, config),
+  BysMcmc::Bsr::Gibbs::StdLinearFullBlock blk = [[
   //Defining the block in the Markov Chain
   Real _define = define(name, varNames, numBlock, firstCol, config);

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

@@ -17 +17 @@
 {
   If(!Card(outputMissingBlock), 
-  BysMcmc::NoBlockSampler(name, Empty, numBlock, firstCol, config),
-  BysMcmc::Bsr::Gibbs::StdLinearBlock blk = [[
+  BysMcmc::Bsr::Gibbs::NoStdLinearBlock(name, Empty, numBlock, firstCol, config),
+  BysMcmc::Bsr::Gibbs::StdLinearFullBlock blk = [[
   //Given initial values of block variables
   VMatrix _.store = Mat2VMat(SetMat(Extract(outputMissingBlock, 6)));

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

@@ -483 +483 @@
 //////////////////////////////////////////////////////////////////////////////
 {
+  Real initialize.subBlocks(Real unused);
+  Real matchConstrains(VMatrix beta0, VMatrix A, VMatrix a);
+
+  ////////////////////////////////////////////////////////////////////////////
+  Real initialize(Real unused) 
+  ////////////////////////////////////////////////////////////////////////////
+  { 
+    initialize.subBlocks(unused)
+  };
+
+  ////////////////////////////////////////////////////////////////////////////
+  //Default behaviour assumes standarized linear regression
+  VMatrix standarize(VMatrix _Z) 
+  ////////////////////////////////////////////////////////////////////////////
+  { 
+    _Z 
+  };
+
+  ////////////////////////////////////////////////////////////////////////////
+  NameBlock getWorkSpace(Real unused) 
+  ////////////////////////////////////////////////////////////////////////////
+  { 
+    _.ws
+  }
+
+};
+
+//////////////////////////////////////////////////////////////////////////////
+StdLinearBlock NoStdLinearBlock(Text name, Set colNames, 
+                                Real numBlock, Real firstCol, 
+                                Config config)
+//////////////////////////////////////////////////////////////////////////////
+{
+  BysMcmc::Bsr::Gibbs::StdLinearBlock noBlock = 
+  [[
+    Real _define = define(name, colNames, numBlock, firstCol, config);
+    VMatrix draw(Real numSim) { ? };
+    Code _.buildWorkSpace = draw;
+    Real initialize.subBlocks(Real unused) { ? };
+    Real matchConstrains(VMatrix beta0, VMatrix A, VMatrix a) { ? }
+  ]];
+  noBlock
+};
+
+//////////////////////////////////////////////////////////////////////////////
+Text _.autodoc.member.StdLinearFullBlock =
+"Builds a NameBlock that can draw a Gibbs sample of an standarized linear "
+"block of a general regression model with variant input and ouput regression "
+"matrices and optional but fixed constraining inequations.";
+//////////////////////////////////////////////////////////////////////////////
+Class StdLinearFullBlock: StdLinearBlock
+//////////////////////////////////////////////////////////////////////////////
+{
   BysMcmc::Bsr::Gibbs::StdLinearSubBlock _.subBlock = 
     BysMcmc::Bsr::Gibbs::StdLinearSubBlock.Build(_MID+"[_.subBlock] ");
@@ -551 +604 @@
 
 };
-
 /*
 //////////////////////////////////////////////////////////////////////////////