Changeset 3666c07 in tol

Timestamp:

May 15, 2009, 7:46:34 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

ce02ff8

Parents:

7ee3411

Message:

Specializations of methods define and get.draw in SubMasterBlockSampler

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

File:

• tol/stdlib/math/stat/models/bayesian/bysMcmc/_masterSampler.tol (modified) (3 diffs)

tol/stdlib/math/stat/models/bayesian/bysMcmc/_masterSampler.tol

@@ -37 +37 @@
     };
     BinGroup("<<",EvalSet(_.blocks, grp))
+  };
+
+  ////////////////////////////////////////////////////////////////////////////
+  Text _.autodoc.member.define =
+  "Creates common information handler about each MCMC block"
+  "Arguments are:\n"
+  "  Text name: Identifies the block.\n"
+  "  Set colNames: Identifiers of block parameters that must be all unique.\n"
+  "  McmcPartialHandler mcmcPartialHandler: partial simulation info.\n"
+  "  Real numBlock: The position of this block in full MCMC.\n"
+  "  Real firstCol: First column of this block in full MCMC\n"
+  "  NameBlock config: User configuration parameters\n";
+  Real define(Text name, 
+              Set colNames, 
+              BysMcmc::McmcPartialHandler mcmcPartialHandler,
+              Real numBlock, 
+              Real firstCol,
+              BysMcmc::Config config)
+  ////////////////////////////////////////////////////////////////////////////
+  { 
+    Text _.name := name;
+    Text _MID := "[MasterSampler "+name+"] ";
+    Real _.N := Card(colNames);
+    Real If(_.N, {
+      Real GT0 (Real idx) { idx>0 };
+      Set _.colNames := SetTolNameAndIndex(colNames);
+      Real SetIndexByName(_.colNames);
+      1
+    });
+    Real _.numBlock := numBlock;
+    Real _.firstCol := firstCol;
+    Real _.lastCol  := firstCol+_.N-1;
+    Set _.colIdx := Range(_.firstCol, _.lastCol, 1);
+    BysMcmc::Config _.config := config;
+    VMatrix If(Or(!_.N, VRows(_.store)!=_.N), _.store := Rand(_.N,1,0,0), _.store);
+    WriteLn(_MID+" created with "<<
+       _.N+" parameters from "<<_.firstCol+" to "<<_.lastCol+"");
+    1
   };
 
@@ -55 +93 @@
       Real _.reloadParamNum := _.reloadParamNum + 
                               Card(blk::_.partialSampler::_.reloadParam); 
-      Real _.N := _.N + blk::_.N; 
       blk::initialize(0)
     };
@@ -107 +144 @@
   {
     draw.blocks(numSim) 
+  };
+
+  ////////////////////////////////////////////////////////////////////////////
+  VMatrix get.draw(Real numSim, Real force)
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    draw(numSim) 
   };