Changeset 1030 for library

Timestamp:

06/02/10 13:53:29 (14 years ago)

Author:

prikryl

Message:

Corrected win32-specific error: pow(2,n) calls on these systems are ambiguous (there are three variants of pow() with different double/float/long double parameters). Replaced pow() with left shift and reorganised some parts of the code.

Location:

library/bdm/estim

Files:

• arx.cpp (modified) (2 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
-    int nalternatives = pow(2, nparams);    // number of alternatives
-    
+    //kamil: int nalternatives = pow(2, nparams);    // number of alternatives
+    int nalternatives = 1 << nparams;    // number of alternatives
+
     // Permutation matrix
     mat perm_matrix = ones(nalternatives, nparams);
     int i, j, period, idx_from, idx_to, start, end;
     for(i = 0; i < nparams; i++) {
-        idx_from = pow(2, i);
-        idx_to = 2 * pow(2, i) - 1;
-        period = pow(2, i+1);
-        j = 0;
+        // 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;
-        while(start < pow(2, nparams)) {
+        // kamil: while(start < pow(2, nparams)) {
+                while ( start < nalternatives ) {
             perm_matrix.set_submatrix(start, end, i, i, 0);
             j++;
@@ -337 +344 @@
         }
 
-        nalternatives_cond = sum(vec_alt) + 1;
+        // 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();
-                int philen = pow(2, est._V().cols() - 1);
+                // 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
                 dimc += philen;