Changeset 1d5725b in tol for tol_tests

Timestamp:

Oct 13, 2009, 2:34:04 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

908d942

Parents:

2a72772

Message:

Checking new features related to #758

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

Location:

tol_tests/tol/BSR

Files:

• test_02/def.tol (modified) (4 diffs)
• test_02/test.tol (modified) (2 diffs)
• test_03/def.tol (modified) (2 diffs)

tol_tests/tol/BSR/test_02/def.tol

@@ -29 +29 @@
 Real n  = IntRand(10,10);
 //Data length of each observational node
-Real m  = IntRand(100,100);
+Real m  = IntRand(300,300);
 //Number of observational nodes
 Real K1 = IntRand(4,4);
@@ -44 +44 @@
 Real q7 = enableARMA*IntRand(0,Max(0,1-p7));
 //Number of missing values in input matrix
-Real MissInp = IntRand(0.01*n*K1,0.05*n*K1);
-//Number of missing values in input matrix
-Real MissOut = IntRand(0.002*m*K1,0.005*m*K1);
+Real MissInp = IntRand(0.003*m*K1,0.009*m*K1);
+//Number of missing values in output matrix
+Real MissOut = IntRand(0.003*m*K1,0.009*m*K1);
 //Total number of variables at obervational level
 Real N1 = n*K1;
@@ -300 +300 @@
   //al bloque de omitidos del input es singular. De momento no se simulan
   //omitidos sin prior
-  Real rnd = IntRand(2,3);
+  Real rnd = IntRand(3,4);
   Text prior = Case
   (
     rnd==1, 
     {
-      "? <- "<<value
+      "? <- "<<(value*Rand(0.5,2))
     },
     rnd==2,
     {
-      Real sigma2 = ((value)/2)^2;
-      "? ~ Normal("<<value+","<<sigma2+")"
+      Real min   = If(value>=0, 0, 10*value);
+      Real max   = If(value<=0, 0, 10*value);
+      "? <- "<<(value*Rand(0.5,2))+"\n"+
+      " ~ Uniform("<<min+","<<max+")"
     },
     rnd==3,
+    {
+      Real sigma2 = ((value)/2)^2;
+      "? ~ Normal("<<(value*Rand(0.8,1.2))+","<<sigma2+")"
+    },
+    rnd==4,
     {
       Real sigma2 = ((value)/2)^2;
       Real min   = If(value>=0, 0, 10*value);
       Real max   = If(value<=0, 0, 10*value);
-      "? ~ TruncatedNormal("<<value+","<<sigma2+","<<min+","<<max+")"
+      "? ~ TruncatedNormal("<<(value*Rand(0.8,1.2))+","<<sigma2+","<<min+","<<max+")"
     }
   );
@@ -348 +355 @@
     WriteLn("Cannot set unknown for missing output "+id,"E")
   });
-  Real rnd = IntRand(1,1);
+  Real rnd = IntRand(1,4);
   Text prior = Case
   (
     rnd==1, 
     {
-      "? <- "<<value
+      "? <- "<<(value*Rand(0.5,2))
     },
     rnd==2,
     {
-      Real sigma2 = ((value)/2)^2;
-      "? ~ Normal("<<value+","<<sigma2+")"
+      Real min   = If(value>=0, 0, 10*value);
+      Real max   = If(value<=0, 0, 10*value);
+      "? <- "<<(value*Rand(0.5,2))+"\n"+
+      " ~ Uniform("<<min+","<<max+")"
     },
     rnd==3,
+    {
+      Real sigma2 = ((value)/2)^2;
+      "? ~ Normal("<<(value*Rand(0.8,1.2))+","<<sigma2+")"
+    },
+    rnd==4,
     {
       Real sigma2 = ((value)/2)^2;
       Real min   = If(value>=0, 0, 10*value);
       Real max   = If(value<=0, 0, 10*value);
-      "? ~ TruncatedNormal("<<value+","<<sigma2+","<<min+","<<max+")"
+      "? ~ TruncatedNormal("<<(value*Rand(0.8,1.2))+","<<sigma2+","<<min+","<<max+")"
     }
   );

tol_tests/tol/BSR/test_02/test.tol

@@ -54 +54 @@
   bsr.config, 
   BysMcmc::@Notifier::Null(0));
+
 
 //Real cycler::initialize(0);
@@ -111 +112 @@
 Set KDifChart = Extract(CompareTable,7);
 
+Set compare_forecast = For(1,Card(mod::obsNodes),Set(Real nu_node)
+{
+  Set est = (estim::eval.average)[nu_node];
+
+  Set aux = [[
+    Real   stdErr = ((mod::obsNodes)[nu_node])::sse;
+    Real   stdErr.Estim = est::stdErr;
+    Matrix Residuals = ((mod::obsNodes)[nu_node])::e;
+    Matrix Residuals.Estim = est::noise;
+    Matrix Residuals.Cmp = Residuals | Residuals.Estim;
+    Matrix Output = ((mod::obsNodes)[nu_node])::Y;
+    Matrix Output.Estim = est::output.full;
+    Matrix Output.Cmp = Output | Output.Estim
+  ]];
+  Eval(Name((estim::eval.average)[nu_node])+"=aux")
+});
+
 /* */
 

tol_tests/tol/BSR/test_03/def.tol

@@ -344 +344 @@
   //al bloque de omitidos del input es singular. De momento no se simulan
   //omitidos sin prior
-  Real rnd = IntRand(2,3);
+  Real rnd = IntRand(3,4);
   Text prior = Case
   (
     rnd==1, 
     {
-      "? <- "<<value
+      "? <- "<<(value*Rand(0.5,2))
     },
     rnd==2,
     {
-      Real sigma2 = ((value)/2)^2;
-      "? ~ Normal("<<value+","<<sigma2+")"
+      Real min   = If(value>=0, 0, 10*value);
+      Real max   = If(value<=0, 0, 10*value);
+      "? <- "<<(value*Rand(0.5,2))+"\n"+
+      " ~ Uniform("<<min+","<<max+")"
     },
     rnd==3,
+    {
+      Real sigma2 = ((value)/2)^2;
+      "? ~ Normal("<<(value*Rand(0.8,1.2))+","<<sigma2+")"
+    },
+    rnd==4,
     {
       Real sigma2 = ((value)/2)^2;
       Real min   = If(value>=0, 0, 10*value);
       Real max   = If(value<=0, 0, 10*value);
-      "? ~ TruncatedNormal("<<value+","<<sigma2+","<<min+","<<max+")"
+      "? ~ TruncatedNormal("<<(value*Rand(0.8,1.2))+","<<sigma2+","<<min+","<<max+")"
     }
   );
@@ -392 +399 @@
     WriteLn("Cannot set unknown for missing output "+id,"E")
   });
-  Real rnd = IntRand(1,1);
+  Real rnd = IntRand(1,4);
   Text prior = Case
   (
     rnd==1, 
     {
-      "? <- "<<value
+      "? <- "<<(value*Rand(0.5,2))
     },
     rnd==2,
     {
-      Real sigma2 = ((value)/2)^2;
-      "? ~ Normal("<<value+","<<sigma2+")"
+      Real min   = If(value>=0, 0, 10*value);
+      Real max   = If(value<=0, 0, 10*value);
+      "? <- "<<(value*Rand(0.5,2))+"\n"+
+      " ~ Uniform("<<min+","<<max+")"
     },
     rnd==3,
+    {
+      Real sigma2 = ((value)/2)^2;
+      "? ~ Normal("<<(value*Rand(0.8,1.2))+","<<sigma2+")"
+    },
+    rnd==4,
     {
       Real sigma2 = ((value)/2)^2;
       Real min   = If(value>=0, 0, 10*value);
       Real max   = If(value<=0, 0, 10*value);
-      "? ~ TruncatedNormal("<<value+","<<sigma2+","<<min+","<<max+")"
+      "? ~ TruncatedNormal("<<(value*Rand(0.8,1.2))+","<<sigma2+","<<min+","<<max+")"
     }
   );