Changeset 251e783 in tol

Timestamp:

Nov 4, 2009, 6:50:00 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

51bd49e

Parents:

6bef16c

Message:

In MasterToJoint DocInfo of master must be used even when there is just one submodule

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

File:

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

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

@@ -24 +24 @@
   //WriteLn("TRACE MasterToJoint module "+master->ModuleType+" "+Name(master));
     Set subModule = EvalSet(master->SubModule, _childToJoint);
-    If(Card(subModule)==1,subModule[1],{
+    If(Card(subModule)==1, {
+      @BSR.ModelDef(
+        subModule[1]->ModuleType;
+        master->DocInfo;
+        subModule[1]->LinearBlock;
+        subModule[1]->MissingInputBlock;
+        subModule[1]->MissingOutputBlock;
+        subModule[1]->NoiseDistrib;
+        subModule[1]->Y;
+        subModule[1]->X;
+        subModule[1]->a;
+        subModule[1]->A)
+    }, {
     Set LinearBlock = 
     {
@@ -37 +49 @@
       Real SetIndexByName(aux.2);
       aux.2 
-    };
+    };  
     Real n = Card(LinearBlock);
 
@@ -139 +151 @@
       VMatrix X = Convert(Group("ConcatRows",reDim[5]),"Cholmod.R.Sparse");
       VMatrix a = Convert(Group("ConcatRows",reDim[6]),"Cholmod.R.Sparse");
-      VMatrix A = Convert(Group("ConcatRows",reDim[7]),"Blas.R.Dense")
-    )
+      VMatrix A = Convert(Group("ConcatRows",reDim[7]),"Blas.R.Dense"))
   })}
 ]];