Changeset 2412c49 in tol

Timestamp:

May 5, 2011, 7:59:42 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

d6b52ea

Parents:

a881dc8

Message:

Fixes #1193

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

File:

• tol/bmath/bstat/arma.cpp (modified) (3 diffs)

tol/bmath/bstat/arma.cpp

@@ -1335 +1335 @@
   aCor_.ReallocBuffer(N+1);
   int k;
-//k = Levinson      (aCor_, w, x, aCorI_, paCor_, aCorLogDet, period);
-  k = LevinsonARMA  (aCor_, w, x, aCorI_, paCor_, aCorLogDet, period, prod_.ar_, prod_.ma_);
+  k = Levinson      (aCor_, w, x, aCorI_, paCor_, aCorLogDet, period);
+//k = LevinsonARMA  (aCor_, w, x, aCorI_, paCor_, aCorLogDet, period, prod_.ar_, prod_.ma_);
   aCor_ .ReallocBuffer(N);
   aCorI_.ReallocBuffer(N); 
@@ -1366 +1366 @@
     //Std(BText("\naCoviw_=")<<aCoviw_.Name());
     //Std(BText("\nuB_=")<<w0_.Name());
+/*
       a0_.Alloc(mpq,1);
       BMatrix<BDat> W = w0_ << w_;
@@ -1386 +1387 @@
         a0_(k,0) = A(k,0) = aux;
       }
+*/
+      BPolyn<BDat> psi;
+      psi = (prod_.ma_/prod_.ar_).Expand(mpq,BFALSE); 
+      bool Pol2Mat(const BPol& pol, int r, int c, BMat& contens_);
+      BMat PSI0;
+      Pol2Mat(psi, mpq, N, PSI0);
+      a0_ = PSI0*aCoviw_;
     //Std(BText("\naB_=")<<a0_.Name());
     }