Changeset f9d97db in tol

Timestamp:

Oct 9, 2009, 9:05:37 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

90ef6a4

Parents:

03c065a

Message:

Primary modules must explicit all missing, even repeated common input missing

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

File:

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

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

@@ -455 +455 @@
   //Acumulate input.missing.labels to avoid repetitions
   Set input.missing.labels,
+  //Observational node must be in a primary or joint module 
+  Text module.type,
   //The result of calling BysMcmc::Bsr::Import::Constraints
   NameBlock constraints,
@@ -499 +501 @@
   NameBlock _.constraints = constraints;
   Real _.forceZeroInputCoef = forceZeroInputCoef;
-
+  Text _.module.type = module.type;
   Set _.missing = _.output::_.serie.info::_.missing << 
     BinGroup("<<", For(1,_.nInp, Set(Real j)
@@ -506 +508 @@
     //WriteLn("TRACE 1 inp::_.serie.info::_.missing = "<<inp::_.serie.info::_.missing);
     //WriteLn("TRACE 2 input.missing.labels = "<<input.missing.labels);
-      Set aux = If(inp::_.serie.info::_.id_node==inp::_.serie.info::_.missing.label,
+      Set aux = If(Or(_.module.type=="primary",
+                      inp::_.serie.info::_.id_node ==
+                      inp::_.serie.info::_.missing.label),
       {
         inp::_.serie.info::_.missing
@@ -521 +525 @@
       });
     //WriteLn("TRACE 4 aux = "<<aux);
-      Real If(!Card(aux), 0,
+      Real If(Or(_.module.type=="primary", !Card(aux)), 0,
       {
         Set Append(input.missing.labels, aux);