Changeset c81dea8 in tol

Timestamp:

Nov 23, 2008, 3:04:24 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

7ddb849

Parents:

9871d4f2

Message:

Specialized method Get.Equation.Size for non time series observational nodes
Fixed bug in missing values information for non time series observational nodes

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

File:

• tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/dynhlm/_build.node.obs.tol (modified) (8 diffs)

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/dynhlm/_build.node.obs.tol

@@ -36 +36 @@
   Text _.id_node = id_node;
   Text _.name = name;
+  Real _.isTimeSerie = True;
   Serie _.serie = serie;
   Real _.avg = 
@@ -63 +64 @@
   //Sorted list of analyzed dates
   Set _.dates = Dates(Dating(_.serie), _.firstIniVal, _.lastDate);
+  Real Get.Equation.Size(Real unused) 
+  { 
+    Card(_.dates) 
+  };
   Serie _.unk.left = SubSer(CalInd(Dating(_.serie),Dating(_.serie)), 
                        _.firstIniVal, Succ(First(_.serie),Dating(_.serie),-1));
@@ -147 +152 @@
   Text _.id_node = id_node;
   Text _.name = name;
+  Real _.isTimeSerie = False;
   Matrix _.serie = serie;
   Real _.avg = 
@@ -167 +173 @@
   {
     Text txt = IntText(num);
-    "MissingBlk::"+_.missing.label+"::"+_.name+"::"+txt
+    "MissingBlk::"+_.missing.label+"::"+_.name+"::N"+txt
+  };
+  Real Get.Equation.Size(Real unused) 
+  { 
+    Rows(_.serie) 
   };
   //Returns the expression of the t-th regression coefficient that could be a
@@ -174 +184 @@
   {
   //WriteLn("TRACE get.coef t="<<t);
-    Real x = MatDat(_.serie, t);
+    Real x = MatDat(_.serie, t, 1);
     If(IsUnknown(x),
        "+"+missing.name(num),
@@ -182 +192 @@
   {
   //WriteLn("TRACE get.knownCoefOrAvg t="<<t);
-    Real x = MatDat(_.serie, t);
+    Real x = MatDat(_.serie, t,1);
     BysMcmc::Bsr::Import::RealTextS(If(IsUnknown(x),_.avg, x))
   };
   //Sorted list of variables related to missing values
-  Set _.missing = EvalSet(Range(1,Rows(_.serie),1),Set(Real num)
-  {
-    Bsr.Missing.Info(Text Name = missing.name(num), 
-                     Real Average = _.avg, 
-                     Real Sigma = _.stds*_.missing.sigmaFactor, 
-                     Real LowerBound = _.missing.lowerBound, 
-                     Real UpperBound = _.missing.upperBound)
-  })
+  Set _.missing = 
+  {
+    Set aux = EvalSet(Range(1,Rows(_.serie),1),Set(Real num)
+    {
+      Real x = MatDat(_.serie,num,1);
+      If(!IsUnknown(x),Copy(Empty),
+      Bsr.Missing.Info(Text Name = missing.name(num), 
+                       Real Average = _.avg, 
+                       Real Sigma = _.stds*_.missing.sigmaFactor, 
+                       Real LowerBound = _.missing.lowerBound, 
+                       Real UpperBound = _.missing.upperBound))
+    });
+    Select(aux,Card)
+  }
 ]]};
 
@@ -503 +519 @@
   Set Get.TimeInfo(Real unused)
   {
+    If(Not(_.output::_.serie.info::_.isTimeSerie),Copy(Empty),
     BSR.NoiseTimeInfo
     (
@@ -508 +525 @@
       _.output::_.serie.info::_.firstDate,
       _.output::_.serie.info::_.lastDate
-    )
+    ))
   };
   Real Get.Equation.Size(Real unused) 
   { 
-    Card(_.output::_.serie.info::_.dates) 
+    _.output::_.serie.info::Get.Equation.Size(0)
   };
   //Returns Real known output or Text missing name