Changeset 0ed0c00 in tol

Timestamp:

Oct 21, 2008, 11:03:12 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

3c7e287

Parents:

405bdc0

Message:

Handling with vectorial or time series data in a transparent way
Fixed bug in LoadNodeConstraints

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

File:

• tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/dynhlm/_db_api.load.tol (modified) (6 diffs)

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/dynhlm/_db_api.load.tol

@@ -16 +16 @@
   Real _check_unique = SetIndexByName(_.obs.node);
 
-  ///////////////////////////////////////////////////////////////////////////
-  //Returns the asked serie of a node
-  Serie GetSerie(Text id_node, Text id_serie)
+
+  ///////////////////////////////////////////////////////////////////////////
+  //Returns the asked serie or vector of a node
+  Anything GetSerie(Text id_node, Text id_serie)
   ///////////////////////////////////////////////////////////////////////////
   {
     (_.obs.node[id_node])::GetSerie(id_serie)
   };
+
   ///////////////////////////////////////////////////////////////////////////
   //Returns the asked non linear filter of a node
@@ -130 +132 @@
     "  A.vl_coef, Concat(B.id_gibbs_blk,'::',A.id_node,'::',A.id_parameter)  \n"+
     "FROM \n"+
-    "  "+dbName+"."+_table::ConstrLinComb+" as A \n"
-    "  "+dbName+"."+_table::Parameter+" as B \n"
+    "  "+dbName+"."+_table::ConstrLinComb+" as A, \n"+
+    "  "+dbName+"."+_table::Parameter+" as B \n"+
     "WHERE \n"+
     "  A.id_model='"+_.model.name+"' AND \n"+
     "  A.id_session='"+_.session.name+"' AND\n"+
-    "  A.nu_inequation="+IntText(b->nu_inequation)+" AND \n"
+    "  A.nu_inequation="+IntText(b->NumInequation)+" AND \n"+
     "  B.id_model='"+_.model.name+"' AND \n"+
     "  B.id_session='"+_.session.name+"' AND\n"+
@@ -210 +212 @@
 //WriteLn("TRACE LoadObsNode 5");
   NameBlock output = {BysMcmc::Bsr::DynHlm::BuildNode::Obs.Output(
-    BysMcmc::Bsr::DynHlm::BuildNode::Obs.Serie.Info(
+    BysMcmc::Bsr::DynHlm::BuildNode::Obs.Data.Info(
       id_node,db_output->id_series, 
       modelHandler::GetSerie(id_node, db_output->id_series), 
@@ -249 +251 @@
     BysMcmc::Bsr::DynHlm::BuildNode::Obs.Input(
       db_inp->id_parameter,
-      BysMcmc::Bsr::DynHlm::BuildNode::Obs.Serie.Info(
+      BysMcmc::Bsr::DynHlm::BuildNode::Obs.Data.Info(
         id_node,db_inp->id_series, 
         modelHandler::GetSerie(id_node, db_inp->id_series),
@@ -285 +287 @@
   {
     Real p = Degree(Eval(db_tf->te_omega));
-    Serie output = modelHandler::GetSerie(id_node, db_tf->id_series);
     BysMcmc::Bsr::DynHlm::BuildNode::Obs.TransFun(
       id_node,
@@ -293 +294 @@
       BysMcmc::Bsr::DynHlm::BuildNode::Obs.Serie.Info(
         id_node,db_tf->id_series, 
-        output,
+        modelHandler::GetSerie(id_node, db_tf->id_series),
         p,
         db_output->firstDate,