Changeset 051a978 in tol

Timestamp:

Nov 3, 2009, 7:16:36 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

56976ee

Parents:

8450037

Message:

Argument 'Text moduleType' of function BSR.Parse is now mandatory to avoid non easily treatable parser errors

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

File:

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

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_estim.tol

@@ -60 +60 @@
 "Argument `ascii` must be an ASCII file path prepared to be parsed by "
 "function BSR.Parse\n";
-@Cycler GetCyclerFromAscii(Text ascii_, 
+@Cycler GetCyclerFromAscii(Text ascii_, Text moduleType,
                           @McmcPartialHandler mcmcPartialHandler,
                           @Config config,
@@ -69 +69 @@
   Text ascii = ascii_;
   Real notifier::parsing(0);
-  Set parsed = BSR.Parse(ascii);
+  Set parsed = BSR.Parse(ascii,moduleType);
   BysMcmc::@Cycler cycler = GetCyclerFromParsed(
     parsed, mcmcPartialHandler, config, notifier);
@@ -97 +97 @@
       modelDef, mcmcPartialHandler, config, notifier),
     g=="Text", GetCyclerFromAscii(
-      modelDef, mcmcPartialHandler, config, notifier),
+      modelDef, "joint", mcmcPartialHandler, config, notifier),
     g=="NameBlock", 
     {
       Text ascii = BysMcmc::Bsr::Import::Write(modelDef);
+      Real metModTyp = FunctionExist("Text","modelDef::Get.ModuleType");
+      Text moduleType = If(!metModTyp, "joint",
+        ToLower(modelDef::Get.ModuleType(0)));
       BysMcmc::@Cycler cycler = GetCyclerFromAscii(
-        ascii, mcmcPartialHandler, config, notifier);
+        ascii, moduleType, mcmcPartialHandler, config, notifier);
       Real cycler::setImporter(modelDef);
       cycler