adjust example for paper

Author: tbrown122387

examples/examples

@@ -11,7 +11,7 @@
 // some template parameters
 #define dimstate 1
 #define dimobs   1
-#define numparts 5000
+#define numparts 100
 #define FLOATTYPE float // choose float (faster) or double (slower)
 
 
@@ -58,8 +58,12 @@ void run_svol_comparison(const std::string &csv)
         apfsvol.filter(data[row], v);
         sisrsvol.filter(data[row], v);
 
-        std::cout << bssvol.getExpectations()[0] << ", " << apfsvol.getExpectations()[0] << ", " << sisrsvol.getExpectations()[0] << "\n";
-        //std::cout << bssvol.getLogCondLike() << ", " << apfsvol.getLogCondLike() <<", " << sisrsvol.getLogCondLike() << "\n";
+        std::cout << bssvol.getExpectations()[0] << ", " 
+                  << apfsvol.getExpectations()[0] << ", "
+                  << sisrsvol.getExpectations()[0] << ", "
+                  << bssvol.getLogCondLike() << ", " 
+                  << apfsvol.getLogCondLike() << ", "
+                  << sisrsvol.getLogCondLike() << "\n";
     }
 
 }

examples/svol_comparison.cpp

@@ -176,7 +176,7 @@ void APF<nparts, dimx, dimy, resamp_t, float_t>::filter(const osv &data, const s
 
     if(m_now == 0) 
     {
-        float_t max(-1.0/0.0);
+        float_t max(-std::numeric_limits<float_t>::infinity());
         for(size_t ii = 0; ii < nparts; ++ii)
         {
             // sample particles
@@ -227,8 +227,8 @@ void APF<nparts, dimx, dimy, resamp_t, float_t>::filter(const osv &data, const s
         // set up "first stage weights" to make k index sampler 
         arrayfloat_t logFirstStageUnNormWeights = m_logUnNormWeights;
         arrayVec oldPartics = m_particles;
-        float_t m3(-1.0/0.0);
-        float_t m2(-1.0/0.0);
+        float_t m3(-std::numeric_limits<float_t>::infinity());
+        float_t m2(-std::numeric_limits<float_t>::infinity());
         for(size_t ii = 0; ii < nparts; ++ii)  
         {
             // update m3
@@ -249,7 +249,7 @@ void APF<nparts, dimx, dimy, resamp_t, float_t>::filter(const osv &data, const s
         arrayUInt myKs = m_kGen.sample(logFirstStageUnNormWeights); 
 
         // now draw xts
-        float_t m1(-1.0/0.0);
+        float_t m1(-std::numeric_limits<float_t>::infinity());
         float_t first_cll_sum(0.0);
         float_t second_cll_sum(0.0);
         float_t third_cll_sum(0.0);
@@ -319,9 +319,5 @@ auto APF<nparts, dimx, dimy, resamp_t, float_t>::getExpectations() const -> std:
     return m_expectations;
 }
 
-
-
-
-
 #endif //APF_H