Changeset 7cbee67 in tol

Timestamp:

Aug 29, 2010, 12:46:28 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

d427ac3

Parents:

e462ba2

Message:

Los formatos de matriz espaciales como BLowTrMatrix dan lugar a errores inesperados por lo que es mejor pasarlos a BMatrix antes de usarlas.

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

File:

• tol/btol/bmodel/maia.cpp (modified) (4 diffs)

tol/btol/bmodel/maia.cpp

@@ -20 +20 @@
  */
 
-//#define TRACE_LEVEL 1
+//#define TRACE_LEVEL 10
 
 #if defined(_MSC_VER)
@@ -204 +204 @@
   minNonZeroParamProb_ = BDat::Unknown();
   BSymMatrix<BDat> M;
-  BLowTrMatrix<BDat> L;
+  BMatrix<BDat> L;
   MTMSquare(x_,M);
-  Choleski(M,L);
+  {
+    BLowTrMatrix<BDat> L_;
+    Choleski(M,L_);
+    L = L_;
+  }
   TRACE_SHOW_HIGH(fun,BText("  M=\n")+M.Name());
   TRACE_SHOW_HIGH(fun,BText("  L=\n")+L.Name());
@@ -232 +236 @@
     eigenValueRelativeRange = Exp(maxLogEigenVal-minLogEigenVal);
     detL = Exp(logDetL);
-    TRACE_SHOW_HIGH(fun,BText("  logDetL=\n")+logDetL);
     t = L.T()*w_/sigma_;
-  }
+    TRACE_SHOW_HIGH(fun,BText("  t=\n")+t.Name());
+  }
+  TRACE_SHOW_HIGH(fun,BText("  logDetL=")+logDetL);
   TRACE_SHOW_HIGH(fun,BText("  DetL=\n")+detL);
   TRACE_SHOW_HIGH(fun,BText("  eigenValueRelativeRange=\n")+eigenValueRelativeRange);
@@ -260 +265 @@
         minNonZeroParamProb_ = tProbNonZero; 
       }
-      TRACE_SHOW_HIGH(fun,BText(" tStudent="+t(i,0)+
-                                " tProbNonZero="+tProbNonZero));
+      TRACE_SHOW_HIGH(fun,BText("")+
+       " i="+i+
+       " tStudent="+t(i,0)+
+       " tProbNonZero="+tProbNonZero);
     }
   }