Changeset db2b6d3 in tol

Timestamp:

May 13, 2010, 2:57:32 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

a399c87

Parents:

9421997

Message:

Uso de Require

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

Location:

tol_pkg/BysVecLinReg/test

Files:

• test_0001/test.tol (modified) (3 diffs)
• test_0002/test.tol (modified) (2 diffs)
• test_0003/test.tol (modified) (2 diffs)

tol_pkg/BysVecLinReg/test/test_0001/test.tol

@@ -12 +12 @@
 Real numErr0 = Copy(NError);
 
+#Require BysVecLinReg;
 #Embed "../gen_multivariant_linear_regression.tol";
 
@@ -41 +42 @@
 
 VMatrix vec.A_ = Tra(Constant(1,sampleLength,1/sampleLength)*mcmc);
-VMatrix vec.A = BysVecLinReg::vmatrix2vec(A);
 VMatrix cmp.A = vec.A | vec.A_;
 
@@ -59 +59 @@
 Set partialResults_ = 
 [[
-  numErr0, numErr1, stdErr, stdErr_, quality.adjust
+  numErr0, numErr1, stdErr, stdErr_, quality.adjust,
   ok_.X.Li, ok_.IdxXL, ok_.IdxXLi, okLLt
 

tol_pkg/BysVecLinReg/test/test_0002/test.tol

@@ -12 +12 @@
 Real numErr0 = Copy(NError);
 
+#Require BysVecLinReg;
 #Embed "../gen_multivariant_linear_regression.tol";
 
@@ -23 +24 @@
 
 //Real MV::set.prior.V.none(0);
-Real MV::set.prior.V.inverseWishart(0.90, V);
+Real MV::set.prior.V.inverseWishart(0.10, V);
 
 VMatrix mcmc = Group("ConcatRows", For(1,sampleLength,VMatrix(Real numSim)

tol_pkg/BysVecLinReg/test/test_0003/test.tol

@@ -13 +13 @@
 Real numErr0 = Copy(NError);
 
+#Require BysVecLinReg;
+//Se generará un modelo con r.eq restricciones de igualdad lineales
 Real r.eq = 3;
+Real rndSeed = 792466945;
 #Embed "../gen_multivariant_linear_regression.tol";
 
@@ -42 +45 @@
 }));
 
+//////////////////////////////////////////////////////////////////////////////
+//Standard report
+//////////////////////////////////////////////////////////////////////////////
+
+Set report = { 
+  BysMcmc::@Config cfg = BysMcmc::@Config::Default(0);
+  BysMcmc::Inference::report(
+  MV::_.desc, 
+  Set colNames_ = SetConcat(For(1,MV::_.m,Set(Real j)
+  {
+    For(1,MV::_.d,Text(Real i)
+    {
+      "linblk_a_"<<i<<"_"<<j+"_"+MV::_.outputNames[i]+"_"+MV::_.inputNames[j]
+    })
+  })) << SetConcat(For(1,MV::_.d,Set(Real j)
+  {
+    For(1,MV::_.d,Text(Real i)
+    {
+      "sigblk_s_"<<i<<"_"<<j+"_"+MV::_.outputNames[i]+"_"+MV::_.outputNames[j]
+    })
+  })),
+  Set BysMcmc::@BysInf.Report.Config
+  (
+    cfg::report.raftery.diag.q,
+    cfg::report.raftery.diag.r,
+    cfg::report.raftery.diag.s,
+    cfg::report.raftery.diag.eps,
+    cfg::report.acf.lag,
+    cfg::report.histogram.parts,
+    cfg::report.kerDens.points
+  ),
+  Matrix VMat2Mat(mcmc))};
+
+//////////////////////////////////////////////////////////////////////////////
+//Reporting about average of simulations
+//////////////////////////////////////////////////////////////////////////////
 VMatrix avg = Tra(Constant(1,sampleLength,1/sampleLength)*mcmc);
 VMatrix vec.A_ = BysVecLinReg::vmatrix2vec(