Changeset 558d77a in tol for tol_tests

Timestamp:

Apr 14, 2010, 12:44:21 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

ff4a180b

Parents:

312118f

Message:

Cambios para evitar situaciones de error

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

Location:

tol_tests/tol/ARIMA/mcmc

Files:

• mtrymh.cycle.tol (modified) (1 diff)
• mtrymh.mcmc.tol (modified) (3 diffs)
• mtrymh.tol (modified) (1 diff)

tol_tests/tol/ARIMA/mcmc/mtrymh.cycle.tol

@@ -2 +2 @@
 Set For(1,1000,Real(Real modelNum)
 {
-  Set aux = IncludeText(ReadFile("mtrymh.tol"));
+  //Set aux = IncludeText(ReadFile("mtrymh.tol"));
+  Real OSCmdWait(TOLSH_PATH+"tolsh.exe mtrymh.tol");
   True
 });

tol_tests/tol/ARIMA/mcmc/mtrymh.mcmc.tol

@@ -47 +47 @@
 Real mtm.t0 = Copy(Time);
 //Real TolOprProfiler.Enabled := True;
-While(numSim<2500, append_draw(mtm_arima::draw_multiple_try(0)));
+While(And(numSim<2500,NError==numErr.0), append_draw(mtm_arima::draw_multiple_try(0)));
 //Real TolOprProfiler.Dump("draw_multiple_try.k"<<mtm_arima::_.k+".csv");
 Real mtm.time = (Copy(Time) - mtm.t0)/numSim;
+Real mtm.speed = mtm_arima::_.acceptRatio / mtm.time;
 WriteLn("Time by MTM simulation "<<mtm.time);
 /* */
+Real numErr = Copy(NError) - numErr.0;
+Real numWar = Copy(NWarning) - numWar.0;
+
+Text report.path = "mtrymh.tab";
+
+Real raftery.burnin = ?;
+Real raftery.thinning = ?;
+Real raftery.rate = ?;
+Real raftery.speed = ?;
 
 Matrix cmp = mcmc | Group("ConcatColumns", For(1,Rows(PARAM),Matrix(Real j) 
@@ -57 +67 @@
   Constant(Rows(mcmc),1,MatDat(PARAM,j,1))
 }));
-
-Real mtm.speed = mtm_arima::_.acceptRatio / mtm.time;
-
-Real numErr = Copy(NError) - numErr.0;
-Real numWar = Copy(NWarning) - numWar.0;
-
-/* */
-Text report.path = "mtrymh.tab";
+Set raftery.report = If(numErr, Copy(Empty),
+{[[
+  Matrix raftery=RCODA::raftery.diag(mcmc,{ [[
+    Real verbose=TRUE, 
+    Real varByCol=TRUE,
+    Real q = 0.025;
+    Real r = 0.007;  
+    Real s = 0.950;  
+    Real eps = 0.001
+  ]]});
+  Real raftery.burnin := MatMax(SubCol(raftery,[[1]]));
+  Real raftery.thinning := MatMax(SubCol(raftery,[[4]]));
+  Real raftery.rate := (numSim-raftery.burnin)/(numSim*raftery.thinning);
+  Real raftery.speed := raftery.rate / mtm.time
+]]});
+  
 Text report = ""
   <<rndSeed+"\t"
   <<rndSeed_iv+"\t"
   <<arima.label+"\t"
-  <<arima.time+"\t"
   <<mtm_arima::_.n+"\t"
   <<mtm_arima::_.k+"\t"
+  <<arima.time+"\t"
+  <<mtm.time+"\t"
   <<mtm_arima::_.acceptRatio+"\t"
-  <<mtm.time+"\t"
   <<mtm.speed+"\t"
+  <<raftery.burnin+"\t"
+  <<raftery.thinning+"\t"
+  <<raftery.rate+"\t"
+  <<raftery.speed+"\t"
   <<numErr+"\t"
   <<numWar+"\n";
@@ -81 +103 @@
   +"rndSeed_iv\t"
   +"arima.label\t"
-  +"arima.time\t"
   +"mtm_arima::_.n\t"
   +"mtm_arima::_.k\t"
+  +"arima.time\t"
+  +"mtm.time\t"
   +"mtm_arima::_.acceptRatio\t"
-  +"mtm.time\t"
   +"mtm.speed\t"
+  +"raftery.burnin\t"
+  +"raftery.thinning\t"
+  +"raftery.rate\t"
+  +"raftery.speed\t"
   +"numErr\t"
   +"numWar\n"));
 
+WriteLn(report);
 Text AppendFile(report.path,report);
-WriteLn(report);
 
+

tol_tests/tol/ARIMA/mcmc/mtrymh.tol

@@ -11 +11 @@
 
 
+//Set k.range = [[1]];
 Set k.range = Range(1,Rows(PARAM),1);