Changeset a9a5553 in tol

Timestamp:

Sep 22, 2009, 1:24:19 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

5c7ee7a

Parents:

cb115ec

Message:

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

Location:

tol_tests/tol/BSR

Files:

• test_03/test.tol (modified) (1 diff)
• test_12/test.tol (modified) (2 diffs)
• test_13/test.tol (modified) (1 diff)
• test_15/test.tol (modified) (4 diffs)
• test_16/test.tol (modified) (2 diffs)

tol_tests/tol/BSR/test_03/test.tol

@@ -17 +17 @@
 Real numErr0 = Copy(NError);
 
-Real PutRandomSeed(208774589);
+Real PutRandomSeed(0);
 
 //Random seed setting

tol_tests/tol/BSR/test_12/test.tol

@@ -177 +177 @@
   Code bsr.scalarSampler.nonLinBlock =
     BysMcmc::Options::Scalar.Sampler::Slice;
+//Metodo de aproximacion del arima
+  Text bsr.arimaFilter = BysMcmc::Options::Arima.Filter::FastCholSea;
 //Report configuration
   Real report.raftery.diag.q   = 0.25;
@@ -186 +188 @@
   Real report.kerDens.points   = 0;
 //Generic flags
-  Real do.resume          =  0;
-  Real do.report          =  True;
-  Real do.eval            =  True;
-  Real do.linear.effects  =  True;
-  //Metodo de aproximacion del arima
-  Text bsr.arimaFilter = BysMcmc::Options::Arima.Filter::FastCholSea//;
-//Real bsr.arimaSkipIter = 100
+  Real do.resume          = 0;
+  Real do.report          = True;
+  Real do.eval            = True;
+  Real do.linear.effects  = True;
+  Real do.mcmc.profiler   = True
 ]];
-
 
 BysMcmc::Cycler cycler = BysMcmc::Bsr::DynHlm::DBApi::GetCycler

tol_tests/tol/BSR/test_13/test.tol

@@ -156 +156 @@
 
 Set bsr.parsed = BSR.ModelDef(
+  "joint",
   parsed->DocInfo,
   parsed->LinearBlock,

tol_tests/tol/BSR/test_15/test.tol

@@ -33 +33 @@
   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;
@@ -64 +64 @@
 Set LinearBlk = Select(recover::_.colNames, Real(Text param)
 {
-   If(!TextBeginWith(param,"LinearBlk::"),0,Rand(0,1)<.98)
+   If(!TextBeginWith(param,"LinearBlk::"),0,Rand(0,1)<1)
 });
 
@@ -77 +77 @@
 });
 
+Set ArimaBlk = Select(recover::_.colNames, Real(Text param)
+{
+   If(!TextBeginWith(param,"ArimaBlk::"),0,Rand(0,1)<1)
+});
+
 Set fixedParam = Copy(Empty);
 VMatrix fixedValues = Rand(0,1,0,0);
-Set reloadParam = LinearBlk << MissingBlk << SigmaBlk;
+Set reloadParam = LinearBlk << MissingBlk << SigmaBlk << ArimaBlk;
 
 BysMcmc::McmcPartialHandler partialHandler = 
@@ -111 +116 @@
 
 Real cycler::_.sampler::_.arm.blk::refreshFrequency := 0;
-
 //Real cycler::initialize(0);
-
 BysMcmc::Estimation estim = BysMcmc::Estimation::New(cycler);
-
-Real TolOprProfiler.Enabled := True;
 Real estim::Run(0);
-Real TolOprProfiler.Dump("ses.01");
-
 Real FClose(recover::_.mcmc.handler);
 

tol_tests/tol/BSR/test_16/test.tol

@@ -29 +29 @@
   Real do.mcmc.profiler   = True;
 //Partial sampling
-  Real partialSampling.Sequential = False
+  Real partialSampling.Sequential = True
 ]];
-
-
 
 BysMcmc::McmcRecover recover = BysMcmc::McmcRecover::Load(
@@ -41 +39 @@
 {
    If(!TextBeginWith(param,"Node")|
-       TextEndAt(param,"_Sigma2"),0,Rand(0,1)<.98)
+       TextEndAt(param,"_Sigma2"),0,Rand(0,1)<0.98)
 });
 
 Set MissingBlk = Select(recover::_.colNames, Real(Text param)
 {
-   If(!TextBeginWith(param,"MissInp."),0,Rand(0,1)<.98)
+   If(!TextBeginWith(param,"MissInp."),0,Rand(0,1)<0.98)
 });
 
 Set SigmaBlk = Select(recover::_.colNames, Real(Text param)
 {
-   If(!TextEndAt(param,"_Sigma2"),0,Rand(0,1)<0.5)
+   If(!TextEndAt(param,"_Sigma2"),0,Rand(0,1)<0.98)
 });
+
+Set ArimaBlk = Select(recover::_.colNames, Real(Text param)
+{
+   If(!TextBeginWith(param,"ArmaBlk"),0,Rand(0,1)<.98)
+});
+
 
 Set fixedParam = Copy(Empty);
 VMatrix fixedValues = Rand(0,1,0,0);
-Set reloadParam = LinearBlk << MissingBlk << SigmaBlk;
+Set reloadParam = LinearBlk << MissingBlk << SigmaBlk;//         << ArimaBlk;
 
 BysMcmc::McmcPartialHandler partialHandler =