Changeset ea3e834 in tol

Timestamp:

Sep 30, 2009, 1:43:57 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

a244729

Parents:

2fa3a27

Message:

Renaming Sampler as Modular.Schema

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

Location:

tol

Files:

• btol/vmatrix_type/vmat_bsr.cpp (modified) (1 diff)
• btol/vmatrix_type/vmat_bsr_master.cpp (modified) (8 diffs)
• stdlib/math/stat/models/bayesian/bysMcmc/bsr/_import.tol (modified) (1 diff)
• stdlib/math/stat/models/bayesian/bysMcmc/bsr/dynhlm/_db_api.load.tol (modified) (2 diffs)

tol/btol/vmatrix_type/vmat_bsr.cpp

@@ -786 +786 @@
   );
   AddAndPutName(contens_,BContensText,
-    "Sampler",
+    "Modular.Schema",
     sampler.c_str(),  
     "Sampling strategy is one of these: monophasic, sequential or parallel"

tol/btol/vmatrix_type/vmat_bsr_master.cpp

@@ -36 +36 @@
 {
 public:
-  string sampler;
+  string modularSchema;
   vector<moduleDef> subMod;
   moduleDef currentSubMod;
@@ -42 +42 @@
   bys_sparse_reg_master() 
   : bys_sparse_reg(),
-    sampler(""), 
+    modularSchema(""), 
     subMod(),
     currentSubMod()
@@ -57 +57 @@
       module_type, model_nameDef, model_descriptionDef, 
       session_nameDef, session_descriptionDef, session_authorDef, 
-      samplerOpt,moduleOpt,modulePath,
-      sampler, subModule,
+      modularSchemaOpt,moduleOpt,modulePath,
+      modularSchema, subModule,
       explicit_begin, explicit_end, problem;
 
@@ -134 +134 @@
       explicit_end   = str_p("$END")[assign_explicit_end_] | error_endExpected; 
 
-      samplerOpt = 
+      modularSchemaOpt = 
         (str_p("monophasic") | str_p("sequential") | str_p("parallel")) |
         error_SamplerOptExpected;
@@ -142 +142 @@
         error_ModuleOptExpected;
 
-      sampler = 
-        str_p("Sampler") >> ch_p('=') >>
-        samplerOpt[assign_a(s.sampler)];
+      modularSchema = 
+        str_p("Modular.Schema") >> ch_p('=') >>
+        modularSchemaOpt[assign_a(s.modularSchema)];
 
       modulePath = 
@@ -170 +170 @@
         session_authorDef >>
         //body
-        sampler >> 
+        modularSchema >> 
         (*(subModule))  >>
         (explicit_end | error_declarationExpected )
@@ -252 +252 @@
   const std::string &     fileName,
   doc_info&               docInfo,
-  std::string &           sampler,
+  std::string &           modularSchema,
   vector<moduleDef>&      subModules)
 ////////////////////////////////////////////////////////////////////////////////
@@ -266 +266 @@
     docInfo.session_description =  bsr.docInfo.session_description;
     docInfo.session_authors     =  bsr.docInfo.session_authors;
-    sampler                     =  bsr.sampler; 
+    modularSchema               =  bsr.modularSchema; 
     subModules                  =  bsr.subMod;
   }

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/_import.tol

@@ -580 +580 @@
   Set modules = model::Get.Modules(0);
   Real Write.Header(model, f.bsr, "master");
-  Real FPutText(f.bsr,"Sampler = "+model::Get.Sampler(0)+"\n");
+  Real FPutText(f.bsr,"Modular.Schema = "+model::Get.Modular.Schema(0)+"\n");
 
   Set EvalSet(modules, Real(NameBlock module)

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

@@ -816 +816 @@
 
   Set _.input.missing.labels = [[ Copy(Empty) ]];
-  Text _.sampler = config::DBApi.masterSampler;
+  Text _.modular.Schema = config::DBApi.masterSampler;
 
   Set _.nodes.obs = 
@@ -910 +910 @@
   
   Text Get.ModuleType(Real unused) { _.moduleType };
-  Text Get.Sampler(Real unused) { _.sampler };
+  Text Get.Modular.Schema(Real unused) { _.modular.Schema };
   Set Get.Modules(Real unused) { _.modules }