Changeset ee53e55 in tol

Timestamp:

Jun 10, 2010, 9:37:12 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

3bace1f

Parents:

d144998

Message:

Fixes #917
Merging linear blocks of child modules has to accept repeated variables when the InitialValue is the same in all redefinitions.
The Unique operator checks for all fields of structure @BSR.LinearBlock including 'Used' field that is not relevant

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

File:

• tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/modularSchema/_monophasic.tol (modified) (1 diff)

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/modularSchema/_monophasic.tol

@@ -47 +47 @@
     Set LinearBlock = 
     {
-      Set aux.1 = EvalSet(subModule, Set(@BSR.ModelDef module)
+      Set defined = Copy(Empty);
+      Set EvalSet(subModule, Real(@BSR.ModelDef module)
       {
         Set sel = Select(module->LinearBlock, Real(@BSR.LinearBlock v)
         {
-          Not(v->Extern)
-        })
-      });
-      Set aux.2 = Unique(SetConcat(aux.1));
-      Real If(Card(aux.2), SetIndexByName(aux.2));
-      aux.2 
+          If(v->Extern, False,
+          {
+            Real found = FindIndexByName(defined,Name(v));
+            If(!found, True,
+            {
+              Real oldDef = defined[found]->InitialValue;
+              Real newDef = v->InitialValue;
+              If(oldDef==newDef,
+              {
+                Real v->Extern := True;
+                False
+              },
+              {
+                Error("Linear block variable "+Name(v)+" <- "<<newDef+
+                      "is already defined as "+Name(v)+" <- "<<oldDef);
+                True 
+              })
+            }) 
+          })
+        });
+        Set Append(defined,sel,True);
+        True
+      });
+    //Set aux.2 = Unique(SetConcat(aux.1));
+    //Real If(Card(defined), SetIndexByName(defined));
+      defined
     };  
     Real n = Card(LinearBlock);