Changeset b41310e5 in tol

Timestamp:

Aug 24, 2009, 8:30:00 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

bd637b5

Parents:

a0c0550a

Message:

Reordering code

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

File:

• tol_tests/tol/BSR/test_13/test.tol (modified) (3 diffs)

tol_tests/tol/BSR/test_13/test.tol

@@ -11 +11 @@
 
 Real numErr0 = Copy(NError);
+
+BysMcmc::Config bsr.config = 
+[[
+//MCMC dimensions
+  Real mcmc.burnin = 100; 
+  Real mcmc.sampleLength = 2000;
+  Real mcmc.cacheLength = 100;
+
+//Partial sampling
+  Real partialSampling.Sequential = False;
+
+//Basic master configuration
+  Real basic.cholesky.epsilon = 1.E-13;
+  Real basic.cholesky.warningFreq = 100;
+  Real basic.truncMNormal.gibbsNumIter = 5;
+  Real bsr.iniVal.try.givenByUser = 1;
+  Real bsr.iniVal.try.zero = 2;
+  Real bsr.iniVal.try.cnstrMinNorm = 3;
+  Real bsr.iniVal.try.cnstrMLE = 4;
+
+  Text bsr.arimaFilter = BysMcmc::Options::Arima.Filter::FastChol;
+  Real bsr.arimaSkipIter = 1;
+
+  Real bsr.linBlk.MH.useAfterIter   = 10;
+  Real bsr.linBlk.MH.maxRejected    = 3;
+  Real bsr.linBlk.MH.maxConsecutive = 100;
+
+  Real bsr.linBlk.X.drop = 1.E-15;
+  Real bsr.linBlk.usePreconditioning = 0;
+
+//Report configuration
+  Real report.raftery.diag.q   = 0.25;
+  Real report.raftery.diag.r   = 0.07;   
+  Real report.raftery.diag.s   = 0.90;   
+  Real report.raftery.diag.eps = 0.01; 
+  Real report.acf.lag          = 20,
+  Real report.histogram.parts  = 100;
+  Real report.kerDens.points   = 0;
+//Generic flags
+  Real do.resume          = 0;
+  Real do.report          = True;
+  Real do.eval            = True;
+  Real do.linear.effects  = False;
+  Real do.mcmc.profiler   = True
+]];
+
+
+BysMcmc::McmcRecover recover = BysMcmc::Get.Recover(
+  "../test_11/", "Test11", "Test11.01", 
+  bsr.config);
+
 
 Set parsed = BSR.Parse("model.bsr");
@@ -117 +168 @@
 
 
-BysMcmc::Config bsr.config = 
-[[
-//MCMC dimensions
-  Real mcmc.burnin = 100; 
-  Real mcmc.sampleLength = 2000;
-  Real mcmc.cacheLength = 100;
-
-//Partial sampling
-  Real partialSampling.Sequential = False;
-
-//Basic master configuration
-  Real basic.cholesky.epsilon = 1.E-13;
-  Real basic.cholesky.warningFreq = 100;
-  Real basic.truncMNormal.gibbsNumIter = 5;
-  Real bsr.iniVal.try.givenByUser = 1;
-  Real bsr.iniVal.try.zero = 2;
-  Real bsr.iniVal.try.cnstrMinNorm = 3;
-  Real bsr.iniVal.try.cnstrMLE = 4;
-
-  Text bsr.arimaFilter = BysMcmc::Options::Arima.Filter::FastChol;
-  Real bsr.arimaSkipIter = 1;
-
-  Real bsr.linBlk.MH.useAfterIter   = 10;
-  Real bsr.linBlk.MH.maxRejected    = 3;
-  Real bsr.linBlk.MH.maxConsecutive = 100;
-
-  Real bsr.linBlk.X.drop = 1.E-15;
-  Real bsr.linBlk.usePreconditioning = 0;
-
-//Report configuration
-  Real report.raftery.diag.q   = 0.25;
-  Real report.raftery.diag.r   = 0.07;   
-  Real report.raftery.diag.s   = 0.90;   
-  Real report.raftery.diag.eps = 0.01; 
-  Real report.acf.lag          = 20,
-  Real report.histogram.parts  = 100;
-  Real report.kerDens.points   = 0;
-//Generic flags
-  Real do.resume          = 0;
-  Real do.report          = True;
-  Real do.eval            = True;
-  Real do.linear.effects  = False;
-  Real do.mcmc.profiler   = True
-]];
-
-
-BysMcmc::McmcRecover recover = BysMcmc::Get.Recover(
-  "../test_11/", "Test11", "Test11.01", 
-  bsr.config);
-
 Set fixedParam = Copy(Empty);
 VMatrix fixedValues = Rand(0,1,0,0);
@@ -188 +189 @@
 Real cycler::_.sampler::_.arm.blk::refreshFrequency := 0;
 
-//Real cycler::initialize(0);
-
+Real cycler::initialize(0);
+
+/*
 BysMcmc::Estimation estim = BysMcmc::Estim(cycler);