Changeset 1627a73 in tol

Timestamp:

Aug 31, 2012, 9:33:00 AM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

0c96479

Parents:

0c1edd7

Message:

Allowing white noise models in ARIMA estimation

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

File:

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

tol/btol/bmodel/estim.cpp

@@ -142 +142 @@
 {
   M_->iterationNumber_ = 0;
-  if(ok_)
+  if(ok_ && M_->numParam_)
   {
     M_->GetParameter();
@@ -178 +178 @@
   if(ok_)
   {
-    M_->GetParameter();
-    BInt N1 = M_->residuous_.Size();
-    BInt N2 = M_->paramAPrioriResiduals_.Size();
-    N1 -= N2;
-    M_->residuous_.ReallocBuffer(N1);
-    M_->standardError_ = Sqrt(MtMSqr(M_->A_ )(0,0)/M_->A_.Rows());
-    M_->informationMatrix_ = M_->informationMatrix_/(M_->standardError_^2);
-
-    M_->IntegrateMissingValues();
+    if(M_->numParam_)
+    {
+      M_->GetParameter();
+      BInt N1 = M_->residuous_.Size();
+      BInt N2 = M_->paramAPrioriResiduals_.Size();
+      N1 -= N2;
+      M_->residuous_.ReallocBuffer(N1);
+      M_->standardError_ = Sqrt(MtMSqr(M_->A_ )(0,0)/M_->A_.Rows());
+      M_->informationMatrix_ = M_->informationMatrix_/(M_->standardError_^2);
+      M_->IntegrateMissingValues();
+    }
     M_->Statistics();
     M_->Diagnostics();
+    Std("\n");
   }
   return(ok_);
@@ -281 +284 @@
       if(fixed)
       {
-        aux = BText(" RESTRICTED to Normal(") +mod.paramAPrioriNu_[n]+","+
-                                               mod.paramAPrioriSigma_ [n]+")";
+              aux = BText(" RESTRICTED to Normal(") +mod.paramAPrioriNu_[n]+","+
+                                      mod.paramAPrioriSigma_ [n]+")";
       }
       Std(BText("\nParameter ")+ mod.paramAPrioriName_  [n] +
-                " with order " + mod.paramAPrioriOrder_ [n] + " is " +aux);
+                  " with order " + mod.paramAPrioriOrder_ [n] + " is " +aux);
     }
   }
@@ -293 +296 @@
   {
     mod.CopyInfToSet(contens_);
-  }
+  }  
   BGrammar::DecLevel();
   return;