Changeset 823054d in tol for tol_tests

Timestamp:

Apr 14, 2010, 3:52:59 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

ece8aea

Parents:

f9c7f71

Message:

_.k y _.s se modifican para mantener el ratio de aceptación dentro de un rango dado

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

File:

• tol_tests/tol/ARIMA/mcmc/MTryMetropolis.tol (modified) (2 diffs)

tol_tests/tol/ARIMA/mcmc/MTryMetropolis.tol

@@ -97 +97 @@
     Real _.acceptRatio := _.num_accept / _.num_draw; 
     Real Case(
+    _.acceptRatio<0.50,
+    {
+      If(_.k<_.n,    _.k := _.k+1);
+      If(_.s>1.E-3,  _.s := _.s/_.sFactor)
+    },
+    _.acceptRatio>0.75,
+    {
+      If(_.k>1,     Real _.k := _.k-1);
+      If(_.s<1.E+3, Real _.s := _.s*_.sFactor)
+    });
+
+/*
+    Real Case(
+    _.k>1, { False },
     _.acceptRatio<_.acceptRatioTarget/1.01,
     {
@@ -105 +119 @@
       Real _.s := _.s*_.sFactor
     });
+*/
   //Real If(_.accept, { Real doAfterDraw(0) });
     Real doAfterDraw(0);