Changeset f16fdcd in tol

Timestamp:

Sep 3, 2009, 10:41:59 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

40b58f9

Parents:

a171731

Message:

Calling to new method of _.sampler Real resume(Real unused) instead of Real initialize(Real unused) when we want to continue an stored chain

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

File:

• tol/stdlib/math/stat/models/bayesian/bysMcmc/_cycler.tol (modified) (6 diffs)

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

@@ -83 +83 @@
       Real kerDens.points   = _.config::report.kerDens.points
     )};
-    1
-  };
-
-  ////////////////////////////////////////////////////////////////////////////
-  Text _.autodoc.member.initialize =
-  "Initializes the Markov Chain";
-  Real initialize(Real unused)
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    Real _.notifier::initializing(_.n, _.path);
-    Real _.sampler::initialize(0);
     1
   };
@@ -156 +145 @@
             });
             Matrix lastRow = Sub(resumed,m_,1,1,_.n);
-          //WriteLn("TRACE "+_MID+"lastRow="<<lastRow);
+            WriteLn(_MID+"Setting last resumed row as initial point");
             Real _.sampler::setStore(lastRow);
             m_
@@ -187 +176 @@
   {
     Text _MID = "[Cycler::generate] ";
-    Real WriteLn(_MID+_.name+
-      "\n Storing MCMC in file ....... : "<<_.path+
-      "\n Number of fixed variables .. : "<<_.sampler::_.fixedParamNum+
-      "\n Number of reloaded variables : "<<_.sampler::_.reloadParamNum+
-      "\n Number of sampled variables  : "<<_.sampler::_.freeParamNum+
-      "\n Number of total variables .. : "<<_.n+
-      "\n Number of simulations ...... : "<<sampleLength+
-      "\n Cache length ............... : "<<cacheLength_+
-      "\n Resume ..................... : "<<resume_+
-      If(_mcmc.maxTime<1/0,
-      "\n MaxTime               : "<<_mcmc.maxTime+" seconds",""));
   //Ensures path is all right 
     Real OSDirMake(GetFilePath(_.path));
@@ -219 +197 @@
     Real end = GE(numSim,sampleLength);
   //WriteLn("TRACE "+_MID+"end="<<end);
+    Real runSim = 0;
+    Real _.notifier::initializing(_.n, _.path);
+    Real If(!savedSimulations,
+    {
+       _.sampler::initialize(0)
+    },
+    {
+       _.sampler::resume(0)
+    });
+    Real WriteLn(_MID+_.name+
+      "\n Storing MCMC in file ....... : "<<_.path+
+      "\n Number of fixed variables .. : "<<_.sampler::_.fixedParamNum+
+      "\n Number of reloaded variables : "<<_.sampler::_.reloadParamNum+
+      "\n Number of sampled variables  : "<<_.sampler::_.freeParamNum+
+      "\n Number of total variables .. : "<<_.n+
+      "\n Number of simulations ...... : "<<sampleLength+
+      "\n Cache length ............... : "<<cacheLength_+
+      "\n Resume ..................... : "<<resume_+
+      If(_mcmc.maxTime<1/0,
+      "\n MaxTime ...................  : "<<_mcmc.maxTime+" seconds",""));
+    If(numErr0<NError,
+    {
+      CMsg::Coded::show(BysMcmc::_.cmsg::_.cannotContinueSimulation,
+      [[_MID, Real (NError-numErr0) ]])
+    });
+    Real If(_.config::do.mcmc.profiler, 
+      TolOprProfiler.Enabled := True);
     While(!end,
     {
+      Real runSim := runSim+1;
       Real numSim := numSim+1;
     //WriteLn("TRACE "+_MID+"2 numSim="<<numSim);
@@ -281 +287 @@
       //WriteLn("TRACE "+_MID+"10");
         Real CMsg::Coded::show(BysMcmc::_.cmsg::_.cannotContinueSimulation,
-        [[
-          _MID,
-          Real (NError-numErr0)
-        ]]);
+        [[_MID,Real (NError-numErr0)]]);
         Real end := True
       });
@@ -290 +293 @@
     //WriteLn("TRACE "+_MID+"8");
     });
+    Real If(config::do.mcmc.profiler, 
+      TolOprProfiler.Dump(cycler::_.path+cycler::_.name));
   //WriteLn("TRACE "+_MID+"11");
     Matrix Do MatAppendFile(_.path, cache);
   //WriteLn("TRACE "+_MID+"12");
     Real savedSimulations := numSim;
-    Real _.time := (Time - t0)/numSim;
+    Real _.time := (Time - t0)/runSim;
     WriteLn(" [time by simulation:"<<_.time+"]");
     Real _.notifier::simulating(numSim, _.time);