Changeset 1035

Timestamp:

06/03/10 08:26:03 (14 years ago)

Author:

dedecius

Message:

accepted jp patches

Location:

library/bdm/estim

Files:

• arx.cpp (modified) (3 diffs)
• arx.h (modified) (1 diff)

library/bdm/estim/arx.cpp

@@ -299 +299 @@
     int dimV = est._V().cols();
     int nparams = dimV - 1;                 // number of parameters
-    //kamil: int nalternatives = pow(2, nparams);    // number of alternatives
     int nalternatives = 1 << nparams;    // number of alternatives
 
@@ -306 +305 @@
     int i, j, period, idx_from, idx_to, start, end;
     for(i = 0; i < nparams; i++) {
-        // kamil: idx_from = pow(2, i);
-                // kamil: idx_to = 2 * pow(2, i) - 1;
-                // kamil: period = pow(2, i+1);
-        // jp: what about this?
                 idx_from = 1 << i;
                 period   = ( idx_from << 1 );
         idx_to   = period - 1;
-        // end:jp
                 j = 0;
         start = idx_from;
         end = idx_to;
-        // kamil: while(start < pow(2, nparams)) {
                 while ( start < nalternatives ) {
             perm_matrix.set_submatrix(start, end, i, i, 0);
@@ -344 +337 @@
         }
 
-        // kamil: nalternatives_cond = sum(vec_alt) + 1;
         nalternatives_cond = (int) sum(vec_alt) + 1;
         ivec vec_perm(0);                   // permutation vector

library/bdm/estim/arx.h

@@ -263 +263 @@
         void validate() {
                 ARX::validate();
-                // kamil: int philen = pow(2, est._V().cols() - 1);
-                // but under win32 this call is ambiguous, and moreover it uses
-                // floats to compute 2^n ...
                 int philen = 1 << (est._V().cols() - 1);
                 rvc.add ( RV ( "{phi }", vec_1(philen) ) ); // pocet 2^parametru