Changeset 91f3555 in tol

Timestamp:

Mar 11, 2009, 6:00:55 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

ddc5101

Parents:

943545c

Message:

Selecting variant columns of mcmc to avoid errors in Raftery

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

File:

• tol/stdlib/math/stat/models/bayesian/bysMcmc/_inference_functions.tol (modified) (4 diffs)

tol/stdlib/math/stat/models/bayesian/bysMcmc/_inference_functions.tol

@@ -272 +272 @@
   Real n = Columns(mcmc);
   Real m = Rows   (mcmc);
-  Set coda.raftery.diag = get.coda.raftery.diag(name, colNames, repCfg, mcmc);
+
+  Set idx_ = Range(1,n,1);
+  Set idx = Select(idx_,Real(Real col)
+  {
+    Matrix c = SubCol(mcmc,[[col]]);
+    MatMax(c)>MatMin(c)
+  });
+  Matrix mcmcV = SubCol(mcmc_, idx);
+//WriteLn("TRACE mcmcV("<<Rows(mcmcV)+"x"<<Columns(mcmcV));
+  Set colNamesV = ExtractByIndex(colNames_,idx);
+//WriteLn("TRACE colNamesV="<<colNamesV);
+  Set coda.raftery.diag = get.coda.raftery.diag(name, colNamesV, repCfg, mcmcV);
   Set sample = get.sample(name, colNames, repCfg, mcmc);
   Set coda.summary = get.coda.summary(name, colNames, repCfg, mcmc);
@@ -499 +510 @@
 /////////////////////////////////////////////////////////////////////////////
   Set loadAndReport(Text path, Real burnin, Real length_, Real thinning, 
-                    Text name, Set colNames_, Set repCfg)
+                    Text name, Set colNames, Set repCfg)
 /////////////////////////////////////////////////////////////////////////////
 {
@@ -505 +516 @@
   Real max = (mcmc.dim::Rows-burnin)/thinning;
   Real length = Min(max,length_);
-  Matrix mcmc_ = BysMcmc::Inference::loadMcmc(path, burnin, length, thinning);
+  Matrix mcmc = BysMcmc::Inference::loadMcmc(path, burnin, length, thinning);
+/*
   Set idx_ = Range(1,Columns(mcmc_),1);
   Set idx = Select(idx_,Real(Real col)
@@ -513 +525 @@
   Matrix mcmc = SubCol(mcmc_, idx);
   Set colNames = ExtractByIndex(colNames_,idx);
+*/
   BysMcmc::Inference::report
   (