Changeset f3405af in tol

Timestamp:

Sep 28, 2012, 10:57:30 AM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

a623204

Parents:

dca551f

Message:

Refs #1136
Merging diagnosys p-values in just one prior log-density

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

Location:

tol/btol/bmodel

Files:

• moddiag.cpp (modified) (4 diffs)
• model.cpp (modified) (2 diffs)

tol/btol/bmodel/moddiag.cpp

@@ -632 +632 @@
 */
   BARIMACondLeastSqr condEst(&arma_);
-  condEst.Marquardt(); 
-  x = condEst.StationarityProb(1000); 
+  if(condEst.Marquardt())
+  { 
+    x = condEst.StationarityProb(1000); 
+  }
+  else
+  {
+    x = 1;
+  }
   /*
     Std(BText("\nRegular  AR unary rooots probability = ")+unarys[0].Name());
@@ -700 +706 @@
   }
   qualification_ = 0;
-  arithmeticQualification_ = 0;
+  diagnosysLogPrior_ = 0;
   int n=0, m=1;
   int requiredTests = 0;
@@ -733 +739 @@
     else if(p<=y) { q = x0 + (p-x) * (y0-x0)/(y-x); }
     else          { q = y0 + (p-y) * ( 1-y0)/(1-y); }
-    arithmeticQualification_ += q;
+    diagnosysLogPrior_ += (q==1)?BDat::NegInf():Log(1.0-q);
     requiredTests += (diagQualify_(n) != BDIAGUNNECESSARY);
 /*
@@ -744 +750 @@
 */
   }
-  arithmeticQualification_ /= requiredTests;
+  diagnosysLogPrior_ /= requiredTests;
 /*
   Std(BText("\nModel Average Qualify(1/3, 2/3) = ") +
-      arithmeticQualification_.Name() +";\n");
+      diagnosysLogPrior_.Name() +";\n");
 */
 }

tol/btol/bmodel/model.cpp

@@ -70 +70 @@
 FNDParam(Alfa, "P-Value of F-Schnedecor statistic");
 FNDParam(AR, "Auto-Regressive polynomials");
-FNDParam(ArithmeticQualification, "Diagnostics qualification value");
+FNDParam(DiagnosysLogPrior, "Diagnosys prior log-density");
 FNDParam(Asymmetry, "Asymmetry of residuals");
 FNDParam(Average, "Average of residuals");
@@ -800 +800 @@
   {
     LstFastAppend(lsta,auxa,tmp=NewFND(BText,Qualification,qualifTitle_[qualification_]));
-    LstFastAppend(lsta,auxa,tmp=NewFND(BDat,ArithmeticQualification,arithmeticQualification_));
+    LstFastAppend(lsta,auxa,tmp=NewFND(BDat,DiagnosysLogPrior,diagnosysLogPrior_));
   }
   else
   {
     LstFastAppend(lsta,auxa,tmp=NewFND(BText,Qualification,"?"));
-    LstFastAppend(lsta,auxa,tmp=NewFND(BDat,ArithmeticQualification,BDat::Unknown()));
+    LstFastAppend(lsta,auxa,tmp=NewFND(BDat,DiagnosysLogPrior,BDat::Unknown()));
   }
   LstFastAppend(lsta,auxa,tmp=NewFND(BDat,MaxLHSigma,sigma));