Changeset 77dfa39 in tol

Timestamp:

Nov 19, 2008, 9:50:26 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

9ba790a

Parents:

8d09f87

Message:

User can specify the number of simulations to be resumed (do.resume>0) or las simulations to be skiped (do.resume<0)

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

Location:

tol/stdlib/math/stat/models

Files:

• _init_models.tol (modified) (1 diff)
• bayesian/bysMcmc/_build.tol (modified) (3 diffs)

tol/stdlib/math/stat/models/_init_models.tol

@@ -5 +5 @@
 
 Set Include("mle/_init_mle.tol");
-Set Include("bayesian/_init_bayesian.tol");
+//Set Include("bayesian/_init_bayesian.tol");

tol/stdlib/math/stat/models/bayesian/bysMcmc/_build.tol

@@ -84 +84 @@
       "\n Number of simulations : "<<sampleLength+
       "\n Cache length          : "<<cacheLength_+
-      "\n Resume                : "<<If(resume_,"True","False")+
+      "\n Resume                : "<<resume_+
       If(_mcmc.maxTime<1/0,
       "\n MaxTime               : "<<_mcmc.maxTime+" seconds",""));
@@ -92 +92 @@
     Text numIterFmt = "% "+IntText(numDec)+".0lf";
   //Resume or clean old simulations
-    Real savedSimulations = If(!resume_, 
+    Real savedSimulations = If(resume_==0, 
     {
       Real OSFilRemove(_.path);
@@ -117 +117 @@
         n==_.n, 
         {
-          Real WriteLn(_MID+"resuming "<<m+" old simulations");
-          Matrix lastRow = Sub(old.mcmc,m,1,1,_.n);
-        //WriteLn("TRACE "+_MID+"lastRow="<<lastRow);
-          Real _.sampler::setStore(lastRow);
-          m
+          Real m_ = Case(
+            resume_>0, Min(m,resume_),
+            resume_<0,  Max(0,m+resume_) );
+          If(m_==0,
+          {
+            WriteLn(_MID+"There are not enougth old simulations to resume");
+            Real OSFilRemove(_.path);
+            0
+          },
+          {
+            Real WriteLn(_MID+"resuming "<<m_+" old simulations");
+            Real If(m_==m,0,
+            {
+              Real WriteLn(_MID+"Removing last "<<Real(m-m_)+" old simulations");
+              Matrix resumed = Sub(old.mcmc,1,1,m_,_.n);
+              Matrix MatWriteFile(_.path, resumed);
+              1
+            });
+            Matrix lastRow = Sub(old.mcmc,m_,1,1,_.n);
+          //WriteLn("TRACE "+_MID+"lastRow="<<lastRow);
+            Real _.sampler::setStore(lastRow);
+            m_
+          })
         },
         1==1,