Changeset 0c96479 in tol

Timestamp:

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

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

abe80db

Parents:

1627a73

Message:

Allowing white noise models in ARIMA estimation

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

File:

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

tol/btol/bmodel/modcalc.cpp

@@ -352 +352 @@
       outDifData_.Alloc(1, N_);
       ApplyPolB(outDifData_, 0, fullData_, dif_, difDeg_, outName_+"_Full", 0);
-      Z_ = outDifData_.T();
+      A_ = Z_ = outDifData_.T();
+      residuous_ = A_.Data();
       initialError_ = Sqrt(CenterMoment(outDifData_.Data(),2));
       standardError_ = initialError_;
@@ -621 +622 @@
   numParam_    -= r;
   inputParam_  -= r;
-
+/*
   if(!numParam_)
   {
@@ -631 +632 @@
                     "Introduzca algún parámetro ARMA o una serie input."));
   }
+*/
   param_.ReallocBuffer(numParam_);
   if(ok && (N_<(interruptionIndex_.Size()+numParam_)))
@@ -2031 +2033 @@
   }
 
-  Std(BText("\nTRACE BModel::Statistics() N_=")+N_);
+//Std(BText("\nTRACE BModel::Statistics() N_=")+N_);
   aCorNum_ = N_/4;
-  Std(BText("\nTRACE BModel::Statistics() aCorNum_=")+aCorNum_);
+//Std(BText("\nTRACE BModel::Statistics() aCorNum_=")+aCorNum_);
   if(periodicity_>0)
   {
-    if(aCorNum_< 2*periodicity_+4) { aCorNum_ =  2*periodicity_+4; }
-    Std(BText("\nTRACE BModel::Statistics() aCorNum_=")+aCorNum_);
-  }
-  if(aCorNum_<N_/2) { aCorNum_ = N_/2; }
-  Std(BText("\nTRACE BModel::Statistics() aCorNum_=")+aCorNum_);
+    if(aCorNum_< periodicity_+4) { aCorNum_ =    periodicity_+4; }
+  //Std(BText("\nTRACE BModel::Statistics() aCorNum_=")+aCorNum_);
+  }
+  if(aCorNum_>N_/2) { aCorNum_ = N_/2; }
+//Std(BText("\nTRACE BModel::Statistics() aCorNum_=")+aCorNum_);
 
   if(aCorNum_>0)