Changeset 43cd166 in tol

Timestamp:

Sep 19, 2012, 8:49:43 AM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

8973d5c

Parents:

04e6eaf

Message:

Reducing arguments and fixing descriptions of Bartlett distribution related functions

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

File:

• tol/btol/bmodel/estim.cpp (modified) (7 diffs)

tol/btol/bmodel/estim.cpp

@@ -1442 +1442 @@
   const BMat& acf,
   int T,
-  int n,
   int s)
 //--------------------------------------------------------------------
 {
   static double _05log2pi = 0.5*log(2*3.14159265358979323846);
+  int n = acf.Rows();
   int res;
   BMat rho, rho_, dif, cov, L, eps;
@@ -1460 +1460 @@
 
   res = TolLapack::dpotrf(CblasLower,cov,L);
-  if(!res) { return(BDat::NegInf()); }
+  if(res) { return(BDat::NegInf()); }
   res = TolBlas::dtrsm(CblasLeft,CblasLower,CblasNoTrans,CblasNonUnit,alpha,
                            L,dif,eps);
-  if(!res) { return(BDat::NegInf()); }
+  if(res) { return(BDat::NegInf()); }
   const BDat* eps_i = eps.Data().Buffer();
   BDat eps_sumSqr = 0;
@@ -1476 +1476 @@
 
 //--------------------------------------------------------------------
-static BDat ARMAACFBartlettLLH_Sampling(
+static BDat ARMAACFBartlettLLH_Commuted(
   const BPol& ar,
   const BPol& ma,
   const BMat& acf,
   int T,
-  int n,
-  int s,
   const BMat& L)
 //--------------------------------------------------------------------
 {
   static double _05log2pi = 0.5*log(2*3.14159265358979323846);
+  int n = acf.Rows();
   int res;
   BMat rho, dif, eps;
@@ -1513 +1512 @@
 //--------------------------------------------------------------------
 DeclareContensClass(BDat, BDatTemporary, BDatARMAACFBartlettLLH);
-DefExtOpr(1, BDatARMAACFBartlettLLH, "ARMA.ACF.Bartlett.LLH", 4, 4, 
-  "Polyn Polyn Matrix Real",
-  "(Polyn ar, Polyn ma, Matrix acf, Real T)",
+DefExtOpr(1, BDatARMAACFBartlettLLH, "ARMA.ACF.Bartlett.LLH", 4, 5, 
+  "Polyn Polyn Matrix Real Real",
+  "(Polyn ar, Polyn ma, Matrix acf, Real T [, Real truncating])",
   I2("Calculates the log-likelihood of asymptotic distribution of sample "
      "autocorrelation acf of an ARMA noise z of size T and equations "
@@ -1532 +1531 @@
   BMat& acf = Mat(Arg(3));
   int T = (int)Real(Arg(4));
+  int s = T*4;
+  if(Arg(5)) { s = (int)Real(Arg(5)); }
   int n = acf.Data().Size();
-  int s = T*2;
-  contens_ = ARMAACFBartlettLLH_Theorical(ar,ma,acf,T,n,s);
+  contens_ = ARMAACFBartlettLLH_Theorical(ar,ma,acf,T,s);
 }
 
@@ -1541 +1541 @@
 DeclareContensClass(BMat, BMatTemporary, BMatARMAACFBartlettLLHRandStationary);
 DefExtOpr(1, BMatARMAACFBartlettLLHRandStationary, 
-  "ARMA.ACF.Bartlett.LLH.RandStationary", 6, 6, 
-  "Real Real Matrix Real Real Real",
-  "(Real p, Real q, Matrix acf, Real T, Real sampleSize, Real exact)",
-  I2("Draws the log-likelihood of asymptotic distribution of sample "
+  "ARMA.ACF.Bartlett.LLH.RandStationary", 6, 7, 
+  "Real Real Matrix Real Real Real Real",
+  "(Real p, Real q, Matrix acf, Real T, Real N, Real exact [, Real truncating=N*4])",
+  I2("Draws N times the log-likelihood of asymptotic distribution of sample "
      "autocorrelation of orders from 1 to n of an ARMA noise of size T."
      "Generates stationary polynomials AR and MA of degrees p and q "
      "with uniform distributed modules of roots.",
-     "Simula la log-verosimilitud de la distribución aintótica "
+     "Simula N veces la log-verosimilitud de la distribución aintótica "
      "de las autocorrelaciones muestrales de órdenes 1 a n de un ruido "
      "ARMA de tamaño T.\n"
@@ -1562 +1562 @@
   BMat& acf = Mat(Arg(3));
   int T = (int)Real(Arg(4));
-  int sampleSize = (int)Real(Arg(5));
+  int N = (int)Real(Arg(5));
   bool exact = (int)Real(Arg(6));
   int n = acf.Data().Size();
-  int s = T*2;
-  contens_.Alloc(sampleSize,1);
-  contens_.GetData().Replicate(BDat::NegInf(),sampleSize);
+  int s = T*4;
+  if(Arg(7)) { s = (int)Real(Arg(7)); }
+  contens_.Alloc(N,1);
+  contens_.GetData().Replicate(BDat::NegInf(),N);
   int k;
   int res;
   BPol ar, ma;
   BMat cov, L;
-  if(!exact)
+  if(exact)
+  {
+    for(k=0; k<N; k++)
+    {
+      ar = RandStationary(p,1);
+      ma = RandStationary(q,1);
+      contens_(k,0) = ARMAACFBartlettLLH_Theorical(ar,ma,acf,T,s);
+    }
+  }
+  else
   {
     _covACF_Bartlett(cov,acf,n,T,s);
     res = TolLapack::dpotrf(CblasLower,cov,L);
     if(res) { return; }
+    for(k=0; k<N; k++)
+    {
+      ar = RandStationary(p,1);
+      ma = RandStationary(q,1);
+      contens_(k,0) = ARMAACFBartlettLLH_Commuted (ar,ma,acf,T,L);
+    }
   };
-  for(k=0; k<sampleSize; k++)
-  {
-    ar = RandStationary(p,1);
-    ma = RandStationary(q,1);
-    if(exact)
-    {
-      contens_(k,0) = ARMAACFBartlettLLH_Theorical(ar,ma,acf,T,n,s);
-    }
-    else
-    {
-      contens_(k,0) = ARMAACFBartlettLLH_Sampling(ar,ma,acf,T,n,s,L);
-    }
-  }
 }