Changeset 6b0bd23 in tol

Timestamp:

Feb 20, 2009, 10:07:37 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

0020bfc1

Parents:

e875979

Message:

New method BuildModelDef to allow debugging and advanced modifications of model

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

File:

• tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/_oneNode.tol (modified) (5 diffs)

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/_oneNode.tol

@@ -37 +37 @@
   };
 
-  Text _.autodoc.member.Estim = 
-  "Estimates a model with just one node, usually observational and dense."
+  Text _.autodoc.member.BuildModelDef = 
+  "Creates a BSR model definition with structure of BSR.ModelDef\n" 
+  "Model must have just one node, usually observational and dense."
   "Model is defined as a BSR basic and an optional set of non linear filters."
   "BSR will be built from simplified data argument matching this API"
@@ -54 +55 @@
   "  Set _.arima;           //Set of ARIMAStruct\n"
   "  Real _.sigmaPriorWeight;  //Weight for Bsr.Sigma.Prior.InverseGamma\n"
-  "  Set _.timeInfo;        //Set of BSR.NoiseTimeInfo\n"
+  "  Set _.timeInfo;        //BSR.NoiseTimeInfo\n"
   "]];\n";
-  Set Estim(NameBlock data_, Set nonLinFil, NameBlock config_)
+  Set BuildModelDef(NameBlock data, NameBlock config_)
   ///////////////////////////////////////////////////////////////////////////
   {
     Text _MID = "[EstimOneNode]";
-    //Data source for model defining
-    NameBlock data = data_;
   //WriteLn(_MID+" TRACE 1");
     //Output matrix
@@ -74 +73 @@
     //Observational data length
     Real m = VRows(Y);
-    //Number of variables at linear block
+    //Number of variables at linear block 
     Real n = VColumns(X);
 
@@ -237 +236 @@
   //WriteLn(_MID+" TRACE 9");
     //Building generic model definition
-    Set modelDef = BSR.ModelDef (
+    BSR.ModelDef (
       docInfo = data::_.docInfo,
       linearBlock,
@@ -249 +248 @@
       VMatrix a = domain.a << order.a,
       VMatrix A = domain.A << order.A
-    );
+    )
+  };
+
+  Text _.autodoc.member.Estim = 
+  "Estimates a model with just one node, usually observational and dense."
+  "Model is defined as a BSR basic and an optional set of non linear filters."
+  "BSR will be built from simplified data argument matching this API"
+  "NameBlock data = \n"
+  "[[\n"
+  "//Mandatory members \n"
+  "  Set  _.docInfo         //BSR.DocInfo \n"
+  "  Text _.segmentName;    //Node name\n"
+  "  Set _.linearParamInfo; //Set of Bsr.OneNode.LinearParamInfo\n"
+  "  Anything _.Y;          //Output data (Matrix or VMatrix)\n"
+  "  Anything _.X;          //Input data  (Matrix or VMatrix)\n"
+  "  Real _.sigma;          //Sigma prior value, or ? to freely simulate it\n"
+  "//Optional members \n"
+  "  Set _.orderRelation;   //Set of Bsr.OrderRelation.Info\n"
+  "  Set _.arima;           //Set of ARIMAStruct\n"
+  "  Real _.sigmaPriorWeight;  //Weight for Bsr.Sigma.Prior.InverseGamma\n"
+  "  Set _.timeInfo;        //BSR.NoiseTimeInfo\n"
+  "]];\n";
+  Set Estim(NameBlock data, Set nonLinFil, NameBlock config_)
+  ///////////////////////////////////////////////////////////////////////////
+  {
+    Text _MID = "[EstimOneNode]";
+    //Data source for model defining
+    Set modelDef = BuildModelDef(data, config_);
     Set result = If(Not(config_::mcmc.sampleLength), [[data, modelDef]],
     {