Changeset 9421997 in tol

Timestamp:

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

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

db2b6d3

Parents:

14855c0

Message:

Trazas

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

File:

• tol_pkg/BysVecLinReg/Multivariate.tol (modified) (4 diffs)

tol_pkg/BysVecLinReg/Multivariate.tol

@@ -117 +117 @@
 
   ////////////////////////////////////////////////////////////////////////////
-  // Returns G(A)
+  // Returns G(coefMat)
   // User must inherite a class redefining this method to apply 
   // arbitrary constraining inequalities and set the correct value of _.r.G
-  VMatrix eval.arbitraryConstrainingInequalities(VMatrix A)
+  VMatrix eval.arbitraryConstrainingInequalities(VMatrix coefMat)
   ////////////////////////////////////////////////////////////////////////////
   {
@@ -370 +370 @@
       Real _numTry = 0;
       VMatrix A = BysVecLinReg::vec2vmatrix(vec.A,_.A);
+      VMatrix G.A = Rand(0,0,0,0);
+      Real min.G.A = ?;
       While(And(!match,_numTry<maxAcceptRejectTry),
       {
       //WriteLn("TRACE gibbs.draw.vec.A 3");
-        VMatrix G.A = eval.arbitraryConstrainingInequalities(A);
-        Real match := VMatMin(G.A)>=0;
+        VMatrix G.A := eval.arbitraryConstrainingInequalities(A);
+        Real min.G.A := VMatMin(G.A);
+        Real match := Copy(min.G.A>0);
         VMatrix If(!match, 
         {
@@ -384 +387 @@
       If(match,
       {
-        VMatrix _.vec.A := vec.A;
-        VMatrix _.A := A;
+      //WriteLn("TRACE [BysVecLinReg::@Multivariate::gibbs.draw.vec.A] accepted simulation "<<numSim+" with min.G.A = "<<min.G.A+" after "<<_numTry+" tries ");
+      //WriteLn("TRACE [BysVecLinReg::@Multivariate::gibbs.draw.vec.A] vec.A=\n"<<VMat2Mat(vec.A));
+        VMatrix _.vec.A := Copy(vec.A);
+        VMatrix _.A := Copy(A);
         Copy(_.vec.A)
       },
@@ -391 +396 @@
         WriteLn("[BysVecLinReg::@Multivariate::gibbs.draw.vec.A] Too much "
         "rejected tries at simulation "<<numSim, "W");
-        Copy(_.vec.A)
+        Copy(vec.A)
       })
     })