Changeset 565 for library/bdm/stat/exp_family.cpp

Timestamp:

08/19/09 16:54:24 (15 years ago)

Author:

vbarta

Message:

using own error macros (basically copied from IT++, but never aborting)

Files:

• library/bdm/stat/exp_family.cpp (modified) (9 diffs)

library/bdm/stat/exp_family.cpp

@@ -19 +19 @@
 
 vec egiw::sample() const {
-        it_warning ( "Function not implemented" );
+        bdm_warning ( "Function not implemented" );
         return vec_1 ( 0.0 );
 }
@@ -67 +67 @@
                      - 0.5 * dimx * ( m * log2 + 0.5 * ( dimx - 1 ) * log2pi )  - lg;
 
-        it_assert_debug ( ( ( -nkG - nkW ) > -Inf ) && ( ( -nkG - nkW ) < Inf ), "ARX improper" );
+        bdm_assert_debug ( ( ( -nkG - nkW ) > -Inf ) && ( ( -nkG - nkW ) < Inf ), "ARX improper" );
         return -nkG - nkW;
 }
@@ -82 +82 @@
                 return iLsub * L0 ( 1, end );
         } else {
-                it_error ( "ERROR: est_theta() not implemented for dimx>1" );
-                return 0;
+                bdm_error ( "ERROR: est_theta() not implemented for dimx>1" );
+                return vec();
         }
 }
@@ -99 +99 @@
 
         } else {
-                it_error ( "ERROR: est_theta_cov() not implemented for dimx>1" );
-                return 0;
+                bdm_error ( "ERROR: est_theta_cov() not implemented for dimx>1" );
+                return ldmat();
         }
 
@@ -138 +138 @@
                 return var;
         } else {
-                it_error ( "not implemented" );
-                return vec ( 0 );
+                bdm_error ( "not implemented" );
+                return vec();
         }
 }
@@ -199 +199 @@
         }
         double tmp = res - lognc();;
-        it_assert_debug ( std::isfinite ( tmp ), "Infinite value" );
+        bdm_assert_debug ( std::isfinite ( tmp ), "Infinite value" );
         return tmp;
 }
@@ -256 +256 @@
 
         default:
-                it_error ( "PF::resample(): Unknown resampling method" );
+                bdm_error ( "PF::resample(): Unknown resampling method" );
         }
 
@@ -306 +306 @@
 
 void eEmp::set_statistics ( const vec &w0, const epdf &epdf0 ) {
-        //it_assert_debug(rv==epdf0->rv(),"Wrong epdf0");
         dim = epdf0.dimension();
         w = w0;
@@ -319 +318 @@
 
 void eEmp::set_samples ( const epdf* epdf0 ) {
-        //it_assert_debug(rv==epdf0->rv(),"Wrong epdf0");
         w = 1;
         w /= sum ( w );//renormalize