Changeset 565 for library/bdm/estim

Timestamp:

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

Author:

vbarta

Message:

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

Location:

library/bdm/estim

Files:

• arx.cpp (modified) (3 diffs)
• arx.h (modified) (3 diffs)
• kalman.cpp (modified) (5 diffs)
• kalman.h (modified) (6 diffs)
• mixtures.cpp (modified) (1 diff)
• mixtures.h (modified) (4 diffs)
• particles.h (modified) (1 diff)

library/bdm/estim/arx.cpp

@@ -54 +54 @@
         const ARX* A0 = dynamic_cast<const ARX*> ( B0 );
 
-        it_assert_debug ( V.rows() == A0->V.rows(), "ARX::set_statistics Statistics  differ" );
+        bdm_assert_debug ( V.rows() == A0->V.rows(), "ARX::set_statistics Statistics  differ" );
         set_statistics ( A0->dimx, A0->V, A0->nu );
 }
@@ -80 +80 @@
         int dim = est.dimension();
         int dif = V.rows() - dim ;///<----------- TODO
-        it_assert_debug ( ( dif == 0 ) || ( dif == 1 ), "Give RVs do not match" );
+        bdm_assert_debug ( ( dif == 0 ) || ( dif == 1 ), "Give RVs do not match" );
 
         mat mu ( dim, V.rows() - dim );
@@ -103 +103 @@
         int dim = est.dimension();
         int dif = V.rows() - est.dimension();//-------------TODO
-        it_assert_debug ( ( dif == 0 ) || ( dif == 1 ), "Give RVs do not match" );
+        bdm_assert_debug ( ( dif == 0 ) || ( dif == 1 ), "Give RVs do not match" );
 
         mat mu ( dim, V.rows() - dim );

library/bdm/estim/arx.h

@@ -98 +98 @@
         //! Predictor for empty regressor
         enorm<ldmat>* epredictor() const {
-                it_assert_debug ( dimx == V.rows() - 1, "Regressor is not only 1" );
+                bdm_assert_debug ( dimx == V.rows() - 1, "Regressor is not only 1" );
                 return epredictor ( vec_1 ( 1.0 ) );
         }
@@ -120 +120 @@
                 drv = drv0;
         }
+
         RV& get_yrv() {
                 //if yrv is not ready create it
@@ -130 +131 @@
                 }
                 //yrv should be ready by now
-                it_assert_debug ( _yrv._dsize() == dimx, "incompatible drv" );
+                bdm_assert_debug ( _yrv._dsize() == dimx, "incompatible drv" );
                 return _yrv;
         }

library/bdm/estim/kalman.cpp

@@ -11 +11 @@
         dimy = C0.rows();
 
-        it_assert_debug ( A0.cols() == dimx, "KalmanFull: A is not square" );
-        it_assert_debug ( B0.rows() == dimx, "KalmanFull: B is not compatible" );
-        it_assert_debug ( C0.cols() == dimx, "KalmanFull: C is not square" );
-        it_assert_debug ( ( D0.rows() == dimy ) || ( D0.cols() == dimu ),       "KalmanFull: D is not compatible" );
-        it_assert_debug ( ( Q0.cols() == dimx ) || ( Q0.rows() == dimx ), "KalmanFull: Q is not compatible" );
-        it_assert_debug ( ( R0.cols() == dimy ) || ( R0.rows() == dimy ), "KalmanFull: R is not compatible" );
+        bdm_assert_debug ( A0.cols() == dimx, "KalmanFull: A is not square" );
+        bdm_assert_debug ( B0.rows() == dimx, "KalmanFull: B is not compatible" );
+        bdm_assert_debug ( C0.cols() == dimx, "KalmanFull: C is not square" );
+        bdm_assert_debug ( ( D0.rows() == dimy ) || ( D0.cols() == dimu ), "KalmanFull: D is not compatible" );
+        bdm_assert_debug ( ( Q0.cols() == dimx ) || ( Q0.rows() == dimx ), "KalmanFull: Q is not compatible" );
+        bdm_assert_debug ( ( R0.cols() == dimy ) || ( R0.rows() == dimy ), "KalmanFull: R is not compatible" );
 
         A = A0;
@@ -32 +32 @@
 
 void KalmanFull::bayes ( const vec &dt ) {
-        it_assert_debug ( dt.length() == ( dimy + dimu ), "KalmanFull::bayes wrong size of dt" );
+        bdm_assert_debug ( dt.length() == ( dimy + dimu ), "KalmanFull::bayes wrong size of dt" );
 
         vec u = dt.get ( dimy, dimy + dimu - 1 );
@@ -86 +86 @@
 
 void EKFfull::bayes ( const vec &dt ) {
-        it_assert_debug ( dt.length() == ( dimy + dimu ), "KalmanFull::bayes wrong size of dt" );
+        bdm_assert_debug ( dt.length() == ( dimy + dimu ), "EKFull::bayes wrong size of dt" );
 
         vec u = dt.get ( dimy, dimy + dimu - 1 );
@@ -142 +142 @@
         preA.set_submatrix ( dimy, dimy, ( _P._Ch() ) *A.T() );
 
-//      if ( !qr ( preA,Q,postA ) ) it_warning ( "QR in kalman unstable!" );
         if ( !qr ( preA, postA ) ) {
-                it_warning ( "QR in kalman unstable!" );
+                bdm_warning ( "QR in KalmanCh unstable!" );
         }
 
@@ -217 +216 @@
 //      cout << "_mu:" << _mu <<endl;
 
-//      if ( !qr ( preA,Q,postA ) ) it_warning ( "QR in kalman unstable!" );
         if ( !qr ( preA, postA ) ) {
-                it_warning ( "QR in kalman unstable!" );
+                bdm_warning ( "QR in EKFCh unstable!" );
         }
 

library/bdm/estim/kalman.h

@@ -286 +286 @@
 public:
         void condition ( const vec &QR ) {
-                it_assert_debug ( QR.length() == ( dimx + dimy ), "KFcondRQ: conditioning by incompatible vector" );
+                bdm_assert_debug ( QR.length() == ( dimx + dimy ), "KFcondQR: conditioning by incompatible vector" );
 
                 Q.setD ( QR ( 0, dimx - 1 ) );
@@ -304 +304 @@
 
         void condition ( const vec &R0 ) {
-                it_assert_debug ( R0.length() == ( dimy ), "KFcondR: conditioning by incompatible vector" );
+                bdm_assert_debug ( R0.length() == ( dimy ), "KFcondR: conditioning by incompatible vector" );
 
                 R.setD ( R0 );
@@ -338 +338 @@
         dimu = B0.cols();
 
-        it_assert_debug ( A0.cols() == dimx, "Kalman: A is not square" );
-        it_assert_debug ( B0.rows() == dimx, "Kalman: B is not compatible" );
-        it_assert_debug ( C0.cols() == dimx, "Kalman: C is not square" );
-        it_assert_debug ( ( D0.rows() == dimy ) || ( D0.cols() == dimu ),       "Kalman: D is not compatible" );
-        it_assert_debug ( ( R0.cols() == dimy ) || ( R0.rows() == dimy ), "Kalman: R is not compatible" );
-        it_assert_debug ( ( Q0.cols() == dimx ) || ( Q0.rows() == dimx ), "Kalman: Q is not compatible" );
+        bdm_assert_debug ( A0.cols() == dimx, "Kalman: A is not square" );
+        bdm_assert_debug ( B0.rows() == dimx, "Kalman: B is not compatible" );
+        bdm_assert_debug ( C0.cols() == dimx, "Kalman: C is not square" );
+        bdm_assert_debug ( ( D0.rows() == dimy ) || ( D0.cols() == dimu ),      "Kalman: D is not compatible" );
+        bdm_assert_debug ( ( R0.cols() == dimy ) || ( R0.rows() == dimy ), "Kalman: R is not compatible" );
+        bdm_assert_debug ( ( Q0.cols() == dimx ) || ( Q0.rows() == dimx ), "Kalman: Q is not compatible" );
 
         A = A0;
@@ -355 +355 @@
 template<class sq_T>
 void Kalman<sq_T>::bayes ( const vec &dt ) {
-        it_assert_debug ( dt.length() == ( dimy + dimu ), "KalmanFull::bayes wrong size of dt" );
+        bdm_assert_debug ( dt.length() == ( dimy + dimu ), "Kalman::bayes wrong size of dt" );
 
         sq_T iRy ( dimy );
@@ -439 +439 @@
                 break;
                 default:
-                        it_error ( "unknown policy" );
+                        bdm_error ( "unknown policy" );
                 }
                 // copy result to all models
@@ -486 +486 @@
 template<class sq_T>
 void EKF<sq_T>::bayes ( const vec &dt ) {
-        it_assert_debug ( dt.length() == ( dimy + dimu ), "KalmanFull::bayes wrong size of dt" );
+        bdm_assert_debug ( dt.length() == ( dimy + dimu ), "EKF<>::bayes wrong size of dt" );
 
         sq_T iRy ( dimy, dimy );

library/bdm/estim/mixtures.cpp

@@ -154 +154 @@
 void MixEF::flatten ( const BMEF* M2 ) {
         const MixEF* Mix2 = dynamic_cast<const MixEF*> ( M2 );
-        it_assert_debug ( Mix2->n == n, "Different no of coms" );
+        bdm_assert_debug ( Mix2->n == n, "Different no of coms" );
         //Flatten each component
         for ( int i = 0; i < n; i++ ) {

library/bdm/estim/mixtures.h

@@ -61 +61 @@
                         Array<const epdf*> epdfs ( n + 1 );
                         for ( int i = 0; i < Coms.length(); i++ ) {
-//                      it_assert_debug(!x,"MixEF::MixEF : Incompatible components");
                                 epdfs ( i ) = & ( Coms ( i )->posterior() );
                         }
@@ -75 +74 @@
                         BMEF ( ), n ( Coms0.length() ), Coms ( n ),
                         weights (), method ( QB ) {
-                //      it_assert_debug ( n>0,"MixEF::MixEF : Empty Component list" );
-
                 for ( int i = 0; i < n; i++ ) {
                         Coms ( i ) = ( BMEF* ) Coms0 ( i )->_copy_();
                 }
                 build_est();
-        };
+        }
+
         //! Constructor of empty mixture
         MixEF () :
@@ -91 +89 @@
         MixEF ( const MixEF &M2 ) : BMEF ( ), n ( M2.n ), Coms ( n ),
                         weights ( M2.weights ), method ( M2.method ) {
-                //      it_assert_debug ( n>0,"MixEF::MixEF : Empty Component list" );
-
                 for ( int i = 0; i < n; i++ ) {
                         Coms ( i ) = M2.Coms ( i )->_copy_();
@@ -98 +94 @@
                 build_est();
         }
+
         //! Initializing the mixture by a random pick of centroids from data
         //! \param Com0 Initial component - necessary to determine its type.

library/bdm/estim/particles.h

@@ -177 +177 @@
 
                 vec sample() const {
-                        it_error ( "Not implemented" );
-                        return 0;
+                        bdm_error ( "Not implemented" );
+                        return vec();
                 }
 
                 double evallog ( const vec &val ) const {
-                        it_error ( "not implemented" );
+                        bdm_error ( "not implemented" );
                         return 0.0;
                 }