Changeset 644

Timestamp:

09/29/09 15:34:50 (16 years ago)

Author:

smidl

Message:

win32 compilation fixes - does not compile yet...

Location:

library/bdm

Files:

• estim/particles.cpp (modified) (1 diff)
• stat/exp_family.h (modified) (1 diff)

library/bdm/estim/particles.cpp

@@ -23 +23 @@
         //renormalize
         double sw=sum(_w);
-        if (!isfinite(sw)) {
+        if (!std::_finite(sw)) {
                 for (int i=0;i<n;i++){
-                        if (!isfinite(_w(i))) {_w(i)=0;}
+                        if (!std::_finite(_w(i))) {_w(i)=0;}
                 }
                 sw = sum(_w);
-                if (!isfinite(sw)) {
+                if (!std::_finite(sw)) {
                         bdm_error("Particle filter is lost; no particle is good enough.");
                 }

library/bdm/stat/exp_family.h

@@ -302 +302 @@
                         for (int i=0; i<beta.length(); i++){
                                 GamRNG.setup(beta(i),1);
-                                y(i)=GamRNG.sample();
+                                #pragma omp critical
+                                y(i)=GamRNG();
                         }
                         return y/sum(y);