Changeset 565

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

Files:

• bdm/CMakeLists.txt (modified) (1 diff)
• bdm/base/bdmbase.cpp (modified) (10 diffs)
• bdm/base/bdmbase.h (modified) (19 diffs)
• bdm/base/datasources.cpp (modified) (4 diffs)
• bdm/base/datasources.h (modified) (4 diffs)
• bdm/base/loggers.cpp (modified) (1 diff)
• bdm/base/loggers.h (modified) (2 diffs)
• bdm/base/user_info.cpp (modified) (3 diffs)
• bdm/base/user_info.h (modified) (2 diffs)
• bdm/bdmerror.cpp (added)
• bdm/bdmerror.h (added)
• bdm/design/ctrlbase.cpp (modified) (2 diffs)
• bdm/design/ctrlbase.h (modified) (2 diffs)
• bdm/estim/arx.cpp (modified) (3 diffs)
• bdm/estim/arx.h (modified) (3 diffs)
• bdm/estim/kalman.cpp (modified) (5 diffs)
• bdm/estim/kalman.h (modified) (6 diffs)
• bdm/estim/mixtures.cpp (modified) (1 diff)
• bdm/estim/mixtures.h (modified) (4 diffs)
• bdm/estim/particles.h (modified) (1 diff)
• bdm/math/chmat.cpp (modified) (1 diff)
• bdm/math/chmat.h (modified) (4 diffs)
• bdm/math/functions.h (modified) (5 diffs)
• bdm/math/square_mat.cpp (modified) (6 diffs)
• bdm/math/square_mat.h (modified) (2 diffs)
• bdm/mex/mex_datasource.h (modified) (2 diffs)
• bdm/osutils.cpp (modified) (5 diffs)
• bdm/osutils.h (modified) (1 diff)
• bdm/shared_ptr.h (modified) (7 diffs)
• bdm/stat/discrete.h (modified) (3 diffs)
• bdm/stat/emix.cpp (modified) (6 diffs)
• bdm/stat/emix.h (modified) (4 diffs)
• bdm/stat/exp_family.cpp (modified) (9 diffs)
• bdm/stat/exp_family.h (modified) (15 diffs)
• bdm/stat/merger.cpp (modified) (1 diff)
• bdm/stat/merger.h (modified) (2 diffs)
• tests/shared_ptr_test.cpp (modified) (2 diffs)
• tests/test_kalman.cpp (modified) (1 diff)
• tests/test_kalman_QR.cpp (modified) (1 diff)
• tests/test_kalman_QRexh.cpp (modified) (1 diff)
• tests/testsuite.cpp (modified) (3 diffs)

library/bdm/CMakeLists.txt

@@ -12 +12 @@
 SET(bdm_mex mex/mex_datasource.h mex/mex_parser.h mex/mex_logger.h  )
 
-SET(bdm_support bdmroot.cpp bdmroot.h itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h shared_ptr.h)
+SET(bdm_support bdmerror.cpp bdmerror.h bdmroot.cpp bdmroot.h itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h shared_ptr.h)
 
 IF(WIN32)

library/bdm/base/bdmbase.cpp

@@ -42 +42 @@
         } else {
                 id = iter->second;
-                it_assert ( RV_SIZES ( id ) == size, "RV " + name + " of different size already exists" );
+                bdm_assert_debug ( RV_SIZES ( id ) == size, "RV " + name + " of different size already exists" );
         }
         return id;
@@ -67 +67 @@
 void RV::init ( const Array<std::string> &in_names, const ivec &in_sizes, const ivec &in_times ) {
         len = in_names.length();
-        it_assert_debug ( in_names.length() == in_times.length(), "check \"times\" " );
-        it_assert_debug ( in_names.length() == in_sizes.length(), "check \"sizes\" " );
+        bdm_assert_debug ( in_names.length() == in_times.length(), "check \"times\" " );
+        bdm_assert_debug ( in_names.length() == in_sizes.length(), "check \"sizes\" " );
 
         times.set_length ( len );
@@ -135 +135 @@
 
 shared_ptr<mpdf> epdf::condition (const RV &rv) const {
-        it_warning ("Not implemented");
+        bdm_warning ("Not implemented");
         return shared_ptr<mpdf>();
 }
 
 shared_ptr<epdf> epdf::marginal (const RV &rv) const {
-        it_warning ("Not implemented");
+        bdm_warning ("Not implemented");
         return shared_ptr<epdf>();
 }
@@ -194 +194 @@
         v2v_up = rv.dataind (rv_up);
 
-        it_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
+        bdm_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
 }
 
@@ -202 +202 @@
         v2v_up = upind;
 
-        it_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
+        bdm_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
 }
 
@@ -219 +219 @@
 
 void datalink_m2e::pushup_cond (vec &val_up, const vec &val, const vec &cond) {
-        it_assert_debug (downsize == val.length(), "Wrong val");
-        it_assert_debug (upsize == val_up.length(), "Wrong val_up");
+        bdm_assert_debug (downsize == val.length(), "Wrong val");
+        bdm_assert_debug (upsize == val_up.length(), "Wrong val_up");
         set_subvector (val_up, v2v_up, val);
         set_subvector (val_up, v2c_up, cond);
@@ -259 +259 @@
                 }
         }
-        it_assert_debug ( res.length() == dsize, "this rv is not fully present in crv!" );
+
+        bdm_assert_debug ( res.length() == dsize, "this rv is not fully present in crv!" );
         return res;
 
@@ -294 +295 @@
                 }
         }
-        it_assert_debug ( selfi.length() == rv2i.length(), "this should not happen!" );
+        bdm_assert_debug ( selfi.length() == rv2i.length(), "this should not happen!" );
 }
 
@@ -322 +323 @@
 void RV::from_setting ( const Setting &set ) {
         Array<string> A;
-        it_assert ( !A.length(), "default array not empty" );
         UI::get ( A, set, "names" );
 
@@ -356 +356 @@
                 rvaddok = rv.add ( mpdfs ( i )->_rv() ); //add rv to common rvs.
                 // If rvaddok==false, mpdfs overlap => assert error.
-                it_assert_debug ( rvaddok || !checkoverlap, "mprod::mprod() input mpdfs overlap in rv!" );
+                bdm_assert_debug ( rvaddok || !checkoverlap, "mprod::mprod() input mpdfs overlap in rv!" );
         }
 

library/bdm/base/bdmbase.h

@@ -44 +44 @@
                 //!Default constructor
                 str (ivec ids0, ivec times0) : ids (ids0), times (times0) {
-                        it_assert_debug (times0.length() == ids0.length(), "Incompatible input");
+                        bdm_assert_debug (times0.length() == ids0.length(), "Incompatible input");
                 };
 };
@@ -298 +298 @@
                 //! Returns a sample, \f$ x \f$ from density \f$ f_x()\f$
                 virtual vec sample() const {
-                        it_error ("not implemented");
-                        return vec (0);
+                        bdm_error ("not implemented");
+                        return vec();
                 }
 
@@ -308 +308 @@
                 //! In case the argument is out of suport return -Infinity
                 virtual double evallog (const vec &val) const {
-                        it_error ("not implemented");
+                        bdm_error ("not implemented");
                         return 0.0;
                 }
@@ -326 +326 @@
                 //! return expected value
                 virtual vec mean() const {
-                        it_error ("not implemneted");
-                        return vec (0);
-                };
+                        bdm_error ("not implemneted");
+                        return vec();
+                }
 
                 //! return expected variance (not covariance!)
                 virtual vec variance() const {
-                        it_error ("not implemneted");
-                        return vec (0);
-                };
+                        bdm_error ("not implemneted");
+                        return vec();
+                }
+
                 //! Lower and upper bounds of \c percentage % quantile, returns mean-2*sigma as default
                 virtual void qbounds (vec &lb, vec &ub, double percentage = 0.95) const {
@@ -353 +354 @@
                 void set_rv (const RV &rv0) {
                         rv = rv0;
-                }   //it_assert_debug(isnamed(),""); };
+                }
+
                 //! True if rv is assigned
                 bool isnamed() const {
@@ -359 +361 @@
                         return b;
                 }
+
                 //! Return name (fails when isnamed is false)
                 const RV& _rv() const {
-                        it_assert_debug (isnamed(), "");
+                        bdm_assert_debug (isnamed(), "");
                         return rv;
                 }
@@ -425 +428 @@
 
                 //! Returns a sample from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv
-                virtual vec samplecond (const vec &cond) {it_error ("Not implemented");return vec (0);};
+                virtual vec samplecond (const vec &cond) {
+                        bdm_error ("Not implemented");
+                        return vec();
+                }
 
                 //! Returns \param N samples from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv
@@ -431 +437 @@
 
                 //! Shortcut for conditioning and evaluation of the internal epdf. In some cases,  this operation can be implemented efficiently.
-                virtual double evallogcond (const vec &dt, const vec &cond) {it_error ("Not implemented");return 0.0;}
+                virtual double evallogcond (const vec &dt, const vec &cond) {
+                        bdm_error ("Not implemented");
+                        return 0.0;
+                }
 
                 //! Matrix version of evallogcond
@@ -441 +450 @@
 
                 //! Array<vec> version of evallogcond
-                virtual vec evallogcond_m (const Array<vec> &Dt, const vec &cond) {it_error ("Not implemented");return vec (0);}
+                virtual vec evallogcond_m (const Array<vec> &Dt, const vec &cond) {
+                        bdm_error ("Not implemented");
+                        return vec();
+                }
 
                 //! \name Access to attributes
@@ -497 +509 @@
                 //! constructor
                 mpdf_internal() : mpdf(), iepdf() {set_ep (iepdf);}
+
                 //! Update \c iepdf so that it represents this mpdf conditioned on \c rvc = cond
                 //! This function provides convenient reimplementation in offsprings
                 virtual void condition (const vec &cond) {
-                        it_error ("Not implemented");
-                };
+                        bdm_error ("Not implemented");
+                }
+
                 //!access function to iepdf
                 EPDF& e() {return iepdf;}
@@ -571 +585 @@
                 //! Get val for myself from val of "Up"
                 vec pushdown (const vec &val_up) {
-                        it_assert_debug (upsize == val_up.length(), "Wrong val_up");
+                        bdm_assert_debug (upsize == val_up.length(), "Wrong val_up");
                         return get_vec (val_up, v2v_up);
                 }
@@ -577 +591 @@
                 //! Fill val of "Up" by my pieces
                 void pushup (vec &val_up, const vec &val) {
-                        it_assert_debug (downsize == val.length(), "Wrong val");
-                        it_assert_debug (upsize == val_up.length(), "Wrong val_up");
+                        bdm_assert_debug (downsize == val.length(), "Wrong val");
+                        bdm_assert_debug (upsize == val_up.length(), "Wrong val_up");
                         set_subvector (val_up, v2v_up, val);
                 }
@@ -628 +642 @@
                         //establish c2c connection
                         rvc.dataind (rvc_up, c2c_lo, c2c_up);
-                        it_assert_debug (c2c_lo.length() + v2c_lo.length() == condsize, "cond is not fully given");
+                        bdm_assert_debug (c2c_lo.length() + v2c_lo.length() == condsize, "cond is not fully given");
                 }
 
@@ -746 +760 @@
                 //! default constructors
                 DS() : Drv(), Urv() {};
+
                 //! Returns full vector of observed data=[output, input]
                 virtual void getdata (vec &dt) {
-                        it_error ("abstract class");
-                };
+                        bdm_error ("abstract class");
+                }
+
                 //! Returns data records at indeces.
                 virtual void getdata (vec &dt, const ivec &indeces) {
-                        it_error ("abstract class");
-                };
+                        bdm_error ("abstract class");
+                }
+
                 //! Accepts action variable and schedule it for application.
                 virtual void write (vec &ut) {
-                        it_error ("abstract class");
-                };
+                        bdm_error ("abstract class");
+                }
+
                 //! Accepts action variables at specific indeces
                 virtual void write (vec &ut, const ivec &indeces) {
-                        it_error ("abstract class");
-                };
+                        bdm_error ("abstract class");
+                }
 
                 //! Moves from \f$ t \f$ to \f$ t+1 \f$, i.e. perfroms the actions and reads response of the system.
@@ -768 +786 @@
                 //! Register DS for logging into logger L
                 virtual void log_add (logger &L) {
-                        it_assert_debug (dtsize == Drv._dsize(), "");
-                        it_assert_debug (utsize == Urv._dsize(), "");
+                        bdm_assert_debug (dtsize == Drv._dsize(), "invalid DS: dtsize different from Drv");
+                        bdm_assert_debug (utsize == Urv._dsize(), "invalid DS: utsize different from Urv");
 
                         L_dt = L.add (Drv, "");
@@ -857 +875 @@
                 //! I.e. marginal likelihood of the data with the posterior integrated out.
                 virtual double logpred (const vec &dt) const {
-                        it_error ("Not implemented");
+                        bdm_error ("Not implemented");
                         return 0.0;
                 }
+
                 //! Matrix version of logpred
                 vec logpred_m (const mat &dt) const {
@@ -871 +890 @@
                 //!Constructs a predictive density \f$ f(d_{t+1} |d_{t}, \ldots d_{0}) \f$
                 virtual epdf* epredictor() const {
-                        it_error ("Not implemented");
+                        bdm_error ("Not implemented");
                         return NULL;
                 };
                 //!Constructs conditional density of 1-step ahead predictor \f$ f(d_{t+1} |d_{t+h-1}, \ldots d_{t}) \f$
                 virtual mpdf* predictor() const {
-                        it_error ("Not implemented");
+                        bdm_error ("Not implemented");
                         return NULL;
                 };
@@ -895 +914 @@
                 //! Substitute \c val for \c rvc.
                 virtual void condition (const vec &val) {
-                        it_error ("Not implemented!");
-                };
+                        bdm_error ("Not implemented!");
+                }
 
                 //!@}
@@ -1002 +1021 @@
         condition (cond);
         tmp = iepdf.evallog (dt);
-        // it_assert_debug(std::isfinite(tmp), "Infinite value");
         return tmp;
 }

library/bdm/base/datasources.cpp

@@ -7 +7 @@
         int i;
 
-        it_assert_debug ( dt.length() == rowid.length(), "MemDS:getdata incompatible dt" );
+        bdm_assert_debug ( dt.length() == rowid.length(), "MemDS:getdata incompatible dt" );
         for ( i = 0; i < rowid.length(); i++ ) {
                 dt ( i ) = Data ( rowid ( i ), time - delays ( i ) );
@@ -15 +15 @@
 void MemDS::getdata ( vec &dt, const ivec &indeces ) {
         int j, i;
-        it_assert_debug ( dt.length() == indeces.length(), "MemDS:getdata incompatible dt" );
+        bdm_assert_debug ( dt.length() == indeces.length(), "MemDS:getdata incompatible dt" );
         for ( i = 0; i < indeces.length(); i++ ) {
                 j = indeces ( i );
@@ -29 +29 @@
 
 void MemDS::set_rvs ( RV &drv, RV &urv ) {
-        it_assert_debug ( drv._dsize() == rowid.length(), "MemDS::set_rvs incompatible drv" );
-        it_assert_debug ( urv._dsize() == 0, "MemDS does not support urv." );
+        bdm_assert_debug ( drv._dsize() == rowid.length(), "MemDS::set_rvs incompatible drv" );
+        bdm_assert_debug ( urv._dsize() == 0, "MemDS does not support urv." );
 
         Drv = drv;
@@ -36 +36 @@
 
 MemDS::MemDS ( mat &Dat, ivec &rowid0, ivec &delays0 ) : rowid ( rowid0 ), delays ( delays0 ) {
-        it_assert_debug ( max ( rowid ) <= Dat.rows(), "MemDS rowid is too high for given Dat." );
-        it_assert_debug ( max ( delays ) < Dat.cols(), "MemDS delays are too high." );
+        bdm_assert_debug ( max ( rowid ) <= Dat.rows(), "MemDS rowid is too high for given Dat." );
+        bdm_assert_debug ( max ( delays ) < Dat.cols(), "MemDS delays are too high." );
 
         time = max ( delays );

library/bdm/base/datasources.h

@@ -42 +42 @@
         void getdata ( vec &dt, const ivec &indeces );
         void set_rvs ( RV &drv, RV &urv );
+
         void write ( vec &ut ) {
-                it_error ( "MemDS::write is not supported" );
-        }
+                bdm_error ( "MemDS::write is not supported" );
+        }
+
         void write ( vec &ut, ivec &indices ) {
-                it_error ( "MemDS::write is not supported" );
-        }
+                bdm_error ( "MemDS::write is not supported" );
+        }
+
         void step();
         //!Default constructor
@@ -61 +64 @@
 public:
         void getdata ( vec &dt ) {
-                it_assert_debug ( dt.length() == Data.rows(), "" );
                 dt = Data.get_col ( time );
-        };
-        void getdata ( vec &dt, const ivec &indeces ) {
-                it_assert_debug ( dt.length() == indeces.length(), "" );
-                vec tmp ( indeces.length() );
-                tmp = Data.get_col ( time );
-                dt = tmp ( indeces );
-        };
+        }
+
+        void getdata ( vec &dt, const ivec &indices ) {
+                vec tmp = Data.get_col ( time );
+                dt = tmp ( indices );
+        }
+
         //! returns number of data in the file;
         int ndat() {
@@ -151 +153 @@
 public:
         void getdata ( vec &dt ) {
-                //it_assert_debug ( dt.length() ==Drv.count(),"ArxDS" );
                 dt = H;
-        };
+        }
+
         void getdata ( vec &dt, const ivec &indices ) {
-                it_assert_debug ( dt.length() == indices.length(), "ArxDS" );
                 dt = H ( indices );
-        };
+        }
+
         void write ( vec &ut ) {
-                //it_assert_debug ( ut.length() ==Urv.count(),"ArxDS" );
                 U = ut;
-        };
+        }
+
         void write ( vec &ut, const ivec &indices ) {
-                it_assert_debug ( ut.length() == indices.length(), "ArxDS" );
+                bdm_assert_debug ( ut.length() == indices.length(), "ArxDS" );
                 set_subvector ( U, indices, ut );
-        };
+        }
+
         void step();
+
         //!Default constructor
         ArxDS ( ) {};
@@ -288 +292 @@
                 dt0 = dt;
         }
-        void getdata ( vec &dt0, const ivec &indeces ) {
-                dt0 = dt ( indeces );
+
+        void getdata ( vec &dt0, const ivec &indices ) {
+                dt0 = dt ( indices );
         }
 

library/bdm/base/loggers.cpp

@@ -127 +127 @@
         char filename[200];
 
-        it_assert_debug ( Len <= maxlen, "diffilelog" );
+        bdm_assert_debug ( Len <= maxlen, "diffilelog::write_buffers: Len too large" );
 
         ii = 0;

library/bdm/base/loggers.h

@@ -45 +45 @@
         void step() {
                 if ( ind < maxlen ) ind++;
-                else it_error ( "memlog::ind is too high;" );
+                else bdm_error ( "memlog::ind is too high;" );
         }
+
         void logit ( int id, const vec &v ) {
-                it_assert_debug ( id < vectors.length(), "Logger was not initialized, run init()." );
+                bdm_assert_debug ( id < vectors.length(), "Logger was not initialized, run init()." );
                 if ( id >= 0 ) {
                         vectors ( id ).set_row ( ind, v );
@@ -54 +55 @@
         }
         void logit ( int id, const double &d ) {
-                it_assert_debug ( id < vectors.length(), "Logger was not initialized, run init()." );
-                it_assert_debug ( vectors ( id ).cols() == 1, "Vector expected" );
+                bdm_assert_debug ( id < vectors.length(), "Logger was not initialized, run init()." );
+                bdm_assert_debug ( vectors ( id ).cols() == 1, "Vector expected" );
                 if ( id >= 0 ) {
                         vectors ( id ) ( ind ) = d;

library/bdm/base/user_info.cpp

@@ -33 +33 @@
                 setAutoConvert ( true );
         } catch ( FileIOException f ) {
-                it_error ( "UI error: file " + file_name + " not found." );
+                string msg = "UI error: file ";
+                msg += file_name;
+                msg += " not found.";
+                bdm_error ( msg );
         } catch ( ParseException& P ) {
                 stringstream msg;
                 msg << "UI error: parsing error """ << P.getError() << """ in file " << file_name << " on line " <<  P.getLine() << ".";
-                it_error ( msg.str() );
+                bdm_error ( msg.str() );
         }
 }
@@ -46 +49 @@
                 writeFile ( file_name.c_str() );
         } catch ( FileIOException f ) {
-                it_error ( "UI error: file " + file_name + " is inacessible." );
+                string msg = "UI error: file ";
+                msg += file_name;
+                msg += " is inacessible.";
+                bdm_error ( msg );
         }
 }
@@ -94 +100 @@
                 msg << "There is not any registered class yet!" << endl;
 
-        it_error ( msg.str() );
+        bdm_error ( msg.str() );
 }
 

library/bdm/base/user_info.h

@@ -321 +321 @@
 
                 root *typeless_instance = related_UI.new_instance();
-                it_assert_debug ( typeless_instance, "UI::new_instance failed" );
+                bdm_assert_debug ( typeless_instance, "UI::new_instance failed" );
 
                 instance = dynamic_cast<T*> ( typeless_instance );
@@ -351 +351 @@
                 T *tmp_inst = 0;
                 from_setting ( tmp_inst, element );
-                it_assert_debug ( tmp_inst, "UI::from_setting failed" );
+                bdm_assert_debug ( tmp_inst, "UI::from_setting failed" );
                 instance = tmp_inst;
         }

library/bdm/design/ctrlbase.cpp

@@ -8 +8 @@
         dimu = B0.cols();
 
-        it_assert_debug ( A0.cols() == dimx, "LQG: A is not square" );
-        it_assert_debug ( B0.rows() == dimx, "LQG: B is not compatible" );
-        it_assert_debug ( C0.cols() == dimx, "LQG: C is not square" );
+        bdm_assert_debug ( A0.cols() == dimx, "LQG: A is not square" );
+        bdm_assert_debug ( B0.rows() == dimx, "LQG: B is not compatible" );
+        bdm_assert_debug ( C0.cols() == dimx, "LQG: C is not square" );
 
         A=A0;
@@ -20 +20 @@
 
 void LQG::set_control_parameters(const mat &Qy0, const mat &Qu0, const vec y_req0, int horizon0){
-        it_assert_debug ( Qy0.cols() == dimy, "LQG: wrong dimensions of Qy " );
-        it_assert_debug ( Qu0.cols() == dimu, "LQG: wrong dimensions of Qu " );
-        it_assert_debug ( y_req0.length() == dimy, "LQG: wrong dimensions of y_req " );
+        bdm_assert_debug ( Qy0.cols() == dimy, "LQG: wrong dimensions of Qy " );
+        bdm_assert_debug ( Qu0.cols() == dimu, "LQG: wrong dimensions of Qu " );
+        bdm_assert_debug ( y_req0.length() == dimy, "LQG: wrong dimensions of y_req " );
 
         Qy=Qy0;

library/bdm/design/ctrlbase.h

@@ -19 +19 @@
         public:
                 //! Redesign control strategy 
-                virtual void redesign(){it_error("Not implemented"); };
+                virtual void redesign() {
+                        bdm_error("Not implemented");
+                }
+
                 //! apply control strategy to obtain control input
-                virtual vec apply(const vec &cond){it_error("Not implemented"); return vec(0);}
+                virtual vec apply(const vec &cond) {
+                        bdm_error("Not implemented");
+                        return vec();
+                }
 };
 
@@ -89 +95 @@
                         pre_qr.set_submatrix(0,0,s*pr);
                         pre_qr.set_submatrix(dimx+dimu+dimy, dimu+dimx, -Qy*y_req);
-                        if (!qr(pre_qr,post_qr)) it_warning("QR in LQG unstable");
+                        if (!qr(pre_qr,post_qr)) bdm_warning("QR in LQG unstable");
                         triu(post_qr);
         // hn(m+1:2*m+n+r,m+1:2*m+n+r);

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;
                 }

library/bdm/math/chmat.cpp

@@ -16 +16 @@
         qr ( Z, R );
         Ch = R ( 0, Ch.rows() - 1, 0, Ch.cols() - 1 );
-};
+}
+
 mat chmat::to_mat() const {
         mat F = Ch.T() * Ch;
         return F;
-};
+}
+
 void chmat::mult_sym ( const mat &C ) {
-        it_assert_debug ( C.rows() == dim, "Wrong dimension of U" );
+        bdm_assert_debug ( C.rows() == dim, "Wrong dimension of U" );
         if ( !qr ( Ch*C.T(), Ch ) ) {
-                it_warning ( "QR unstable in chmat mult_sym" );
+                bdm_warning ( "QR unstable in chmat mult_sym" );
         }
-};
+}
+
 void chmat::mult_sym ( const mat &C , chmat &U ) const {
-        it_assert_debug ( C.rows() == U.dim, "Wrong dimension of U" );
+        bdm_assert_debug ( C.rows() == U.dim, "Wrong dimension of U" );
         if ( !qr ( Ch*C.T(), U.Ch ) ) {
-                it_warning ( "QR unstable in chmat mult_sym" );
+                bdm_warning ( "QR unstable in chmat mult_sym" );
         }
-};
+}
+
 void chmat::mult_sym_t ( const mat &C ) {
-        it_assert_debug ( C.cols() == dim, "Wrong dimension of U" );
+        bdm_assert_debug ( C.cols() == dim, "Wrong dimension of U" );
         if ( !qr ( Ch*C, Ch ) ) {
-                it_warning ( "QR unstable in chmat mult_sym" );
+                bdm_warning ( "QR unstable in chmat mult_sym" );
         }
-};
+}
+
 void chmat::mult_sym_t ( const mat &C, chmat &U ) const {
-        it_assert_debug ( C.cols() == U.dim, "Wrong dimension of U" );
+        bdm_assert_debug ( C.cols() == U.dim, "Wrong dimension of U" );
         if ( !qr ( Ch*C, U.Ch ) ) {
-                it_warning ( "QR unstable in chmat mult_sym" );
+                bdm_warning ( "QR unstable in chmat mult_sym" );
         }
 }

library/bdm/math/chmat.h

@@ -14 +14 @@
 #define CHMAT_H
 
-
+#include "../bdmerror.h"
 #include "square_mat.h"
 
@@ -44 +44 @@
         //! add another chmat \c A2 with weight \c w.
         void add ( const chmat &A2, double w = 1.0 ) {
-                it_assert_debug ( dim == A2.dim, "Matrices of unequal dimension" );
+                bdm_assert_debug ( dim == A2.dim, "Matrices of unequal dimension" );
                 mat pre = concat_vertical ( Ch, sqrt ( w ) * A2.Ch );
                 mat post = zeros ( pre.rows(), pre.cols() );
                 if ( !qr ( pre, post ) ) {
-                        it_warning ( "Unstable QR in chmat add" );
+                        bdm_warning ( "Unstable QR in chmat add" );
                 }
                 Ch = post ( 0, dim - 1, 0, dim - 1 );
@@ -70 +70 @@
         chmat ( const chmat &Ch0 ) : sqmat ( Ch0.dim ), Ch ( Ch0.dim, Ch0.dim ) {
                 Ch = Ch0.Ch;
-        };
+        }
+
         //! Default constructor (m3k:cholform)
         chmat ( const mat &M ) : sqmat ( M.rows() ), Ch ( M.rows(), M.cols() ) {
                 mat Q;
-                it_assert_debug ( M.rows() == M.cols(), "chmat:: input matrix must be square!" );
+                bdm_assert_debug ( M.rows() == M.cols(), "chmat:: input matrix must be square!" );
                 Ch = chol ( M );
-        };
-        //! Constructor
-        chmat ( const chmat &M, const ivec &perm ) : sqmat ( M.rows() ) {
-                it_error ( "not implemneted" );
-        };
+        }
+
+        /*!
+          Some templates require this constructor to compile, but
+          it shouldn't actually be called.
+        */
+        chmat ( const chmat &M, const ivec &perm ) {
+                bdm_error ( "not implemented" );
+        }
+
         //! Access function
         mat & _Ch() {
@@ -95 +101 @@
         //! Access functions
         void setCh ( const vec &chQ ) {
-                it_assert_debug ( chQ.length() == dim*dim, "" );
+                bdm_assert_debug ( chQ.length() == dim * dim, "wrong length" );
                 copy_vector ( dim*dim, chQ._data(), Ch._data() );
         }
+
         //! Access functions
         void setD ( const vec &nD, int i ) {

library/bdm/math/functions.h

@@ -13 +13 @@
 #define FN_H
 
+#include "../bdmerror.h"
 #include "../base/bdmbase.h"
 
@@ -44 +45 @@
 public :
         vec eval ( const vec &cond ) {
-                it_assert_debug ( cond.length() == A.cols(), "linfn::eval Wrong cond." );
-                return A*cond + B;
-        };
+                bdm_assert_debug ( cond.length() == A.cols(), "linfn::eval Wrong cond." );
+                return A * cond + B;
+        }
 
 //              linfn evalsome ( ivec &rvind );
@@ -82 +83 @@
         //! Evaluates \f$f(x0,u0)\f$ (VS: Do we really need common eval? )
         vec eval ( const vec &cond ) {
-                it_assert_debug ( cond.length() == ( dimx + dimu ), "linfn::eval Wrong cond." );
+                bdm_assert_debug ( cond.length() == ( dimx + dimu ), "linfn::eval Wrong cond." );
                 return eval ( cond ( 0, dimx - 1 ), cond ( dimx, dimx + dimu - 1 ) );//-1 = end (in matlab)
-        };
+        }
 
         //! Evaluates \f$f(x0,u0)\f$
@@ -115 +116 @@
         //!@{
 
-        bilinfn () : diffbifn () , A() , B()    {};
-        bilinfn ( const mat A0, const mat B0 ) {
+        bilinfn () : diffbifn (), A(), B() { }
+
+        bilinfn ( const mat &A0, const mat &B0 ) {
                 set_parameters ( A0, B0 );
-        };
-        //! Alternative constructor
-        void set_parameters ( const mat A0, const mat B0 ) {
-                it_assert_debug ( A0.rows() == B0.rows(), "" );
+        }
+
+        //! Alternative initialization
+        void set_parameters ( const mat &A0, const mat &B0 ) {
+                bdm_assert_debug ( A0.rows() == B0.rows(), "bilinfn matrices must have the same number of rows" );
                 A = A0;
                 B = B0;
@@ -133 +136 @@
         //!@{
         inline vec eval ( const  vec &x0, const vec &u0 ) {
-                it_assert_debug ( x0.length() == dimx, "linfn::eval Wrong xcond." );
-                it_assert_debug ( u0.length() == dimu, "linfn::eval Wrong ucond." );
+                bdm_assert_debug ( x0.length() == dimx, "bilinfn::eval Wrong xcond." );
+                bdm_assert_debug ( u0.length() == dimu, "bilinfn::eval Wrong ucond." );
                 return A*x0 + B*u0;
         }
 
         void dfdx_cond ( const vec &x0, const vec &u0, mat &F, bool full ) {
-                it_assert_debug ( ( F.cols() == A.cols() ) & ( F.rows() == A.rows() ), "Allocated F is not compatible." );
+                bdm_assert_debug ( ( F.cols() == A.cols() ) && ( F.rows() == A.rows() ), "Allocated F is not compatible." );
                 if ( full ) F = A;      //else : nothing has changed no need to regenerate
         }
-        //!
+
         void dfdu_cond ( const vec &x0, const vec &u0, mat &F,  bool full = true ) {
-                it_assert_debug ( ( F.cols() == B.cols() ) & ( F.rows() == B.rows() ), "Allocated F is not compatible." );
+                bdm_assert_debug ( ( F.cols() == B.cols() ) && ( F.rows() == B.rows() ), "Allocated F is not compatible." );
                 if ( full ) F = B;      //else : nothing has changed no need to regenerate
         }

library/bdm/math/square_mat.cpp

@@ -35 +35 @@
 };
 fsqmat::fsqmat ( const mat &M0 ) : sqmat ( M0.cols() ) {
-        it_assert_debug ( ( M0.cols() == M0.rows() ), "M0 must be square" );
+        bdm_assert_debug ( ( M0.cols() == M0.rows() ), "M0 must be square" );
         M = M0;
 };
@@ -65 +65 @@
 ldmat::ldmat ( const mat &V ) : sqmat ( V.cols() ) {
 
-        it_assert_debug ( dim == V.rows(), "ldmat::ldmat matrix V is not square!" );
+        bdm_assert_debug ( dim == V.rows(), "ldmat::ldmat matrix V is not square!" );
 
         // L and D will be allocated by ldform()
@@ -81 +81 @@
         double *rraw = r._data();
 
-        it_assert_debug ( v.length() == dim, "LD::ldupdt vector v is not compatible with this ld." );
+        bdm_assert_debug ( v.length() == dim, "LD::ldupdt vector v is not compatible with this ld." );
 
         for ( int i = dim - 1; i >= 0; i-- ) {
@@ -123 +123 @@
         int dim = D.length();
 
-        it_assert_debug ( ld2.D.length() == dim, "LD.add() incompatible sizes of LDs;" );
+        bdm_assert_debug ( ld2.D.length() == dim, "LD.add() incompatible sizes of LDs" );
 
         //Fixme can be done more efficiently either via dydr or ldform
@@ -231 +231 @@
         int mn = ( m < n ) ? m : n ;
 
-//      it_assert_debug( A.cols()==dim,"ldmat::ldform A is not compatible" );
-        it_assert_debug ( D0.length() == A.rows(), "ldmat::ldform Vector D must have the length as row count of A" );
+        bdm_assert_debug ( D0.length() == A.rows(), "ldmat::ldform Vector D must have the length as row count of A" );
 
         L = concat_vertical ( zeros ( n, n ), diag ( sqrt ( D0 ) ) * A );
@@ -389 +388 @@
                 *kr = 0.0;
                 if ( *Df < -threshold ) {
-                        it_warning ( "Problem in dydr: subraction of dyad results in negative definitness. Likely mistake in calling function." );
+                        bdm_warning ( "Problem in dydr: subraction of dyad results in negative definitness. Likely mistake in calling function." );
                 }
                 *Df = 0.0;

library/bdm/math/square_mat.h

@@ -16 +16 @@
 
 #include "../itpp_ext.h"
+#include "../bdmerror.h"
 
 namespace bdm
@@ -138 +139 @@
         //! Constructor
         fsqmat ( const mat &M );
-        //! Constructor
-        fsqmat ( const fsqmat &M, const ivec &perm ) : sqmat ( M.rows() ) {
-                it_error ( "not implemneted" );
-        };
+
+        /*!
+          Some templates require this constructor to compile, but
+          it shouldn't actually be called.
+        */
+        fsqmat ( const fsqmat &M, const ivec &perm ) {
+                bdm_error ( "not implemented" );
+        }
+
         //! Constructor
         fsqmat ( const vec &d ) : sqmat ( d.length() ) {

library/bdm/mex/mex_datasource.h

@@ +1 @@
+#include "../bdm/bdmerror.h"
 #include "../bdm/stat/datasources.h"
 #include "mex_parser.h"
@@ -34 +35 @@
                 Data = mxArray2mat ( mexGetVariable ( "base", set["varname"] ) );
                 UI::get ( rowid, set, "rids" , UI::compulsory );
-                it_assert_debug ( max ( rowid ) <= Data.rows(), "MemDS rowid is too high for given Dat." );
+                bdm_assert_debug ( max ( rowid ) <= Data.rows(), "MemDS rowid is too high for given Dat." );
 
                 UI::get ( delays, set, "tds", UI::compulsory );
                 time = max ( delays );
-                it_assert_debug ( time < Data.cols(), "MemDS delays are too high." );
+                bdm_assert_debug ( time < Data.cols(), "MemDS delays are too high." );
 
                 shared_ptr<RV> r = UI::build<RV> ( set, "rv", UI::compulsory );

library/bdm/osutils.cpp

@@ -12 +12 @@
 
 #include "osutils.h"
+#include "bdmerror.h"
 #include <iostream>
 #include <stdexcept>
@@ -47 +48 @@
 #endif
         {
-                if ( ( rewrite ) && ( errno == EEXIST ) ) it_warning ( "rewriting directory" );
-                else it_error ( "dirfilelog:: cannot create directory" );
+                if ( ( rewrite ) && ( errno == EEXIST ) ) bdm_warning ( "rewriting directory" );
+                else bdm_error ( "dirfilelog:: cannot create directory" );
         }
 }
@@ -79 +80 @@
                         std::string msg = "can't remove dir ";
                         msg += path;
-                        throw std::runtime_error ( msg );
+                        bdm_error ( msg );
                 }
         } else {
@@ -87 +88 @@
                                 std::string msg = "can't remove file ";
                                 msg += path;
-                                throw std::runtime_error ( msg );
+                                bdm_error ( msg );
                         }
                 } else {
@@ -93 +94 @@
                                 std::string msg = "can't remove ";
                                 msg += path;
-                                throw std::runtime_error ( msg );
+                                bdm_error ( msg );
                         } else {
                                 // it wasn't there in the first place

library/bdm/osutils.h

@@ -21 +21 @@
 
 /*!
-@brief Function creates a directory and raises it_error if it is not possible
+@brief Function creates a directory
 
 @param dirname name of the directory to be created
 @param rewrite if true then existence of the directory is not an error
+
+Raises std::runtime_error if rewrite is false and dirname already exists.
 */
 void makedir ( string &dirname, bool rewrite = true );

library/bdm/shared_ptr.h

@@ -18 +18 @@
 #include <stdexcept>
 #include <string>
-#include "itpp_ext.h"
+#include "bdmerror.h"
 
 namespace bdm {
@@ -123 +123 @@
         */
         T *operator->() {
-                it_assert_debug ( payload, "dereferencing NULL" );
+                bdm_assert_debug ( payload, "dereferencing NULL" );
                 return payload;
         }
@@ -131 +131 @@
         //! isn't NULL.
         T &operator*() {
-                it_assert_debug ( payload, "dereferencing NULL" );
+                bdm_assert_debug ( payload, "dereferencing NULL" );
                 return *payload;
         }
@@ -147 +147 @@
         //! pointer isn't NULL.
         const T *operator->() const {
-                it_assert_debug ( payload, "dereferencing NULL" );
+                bdm_assert_debug ( payload, "dereferencing NULL" );
                 return payload;
         }
@@ -155 +155 @@
         //! isn't NULL.
         const T &operator*() const {
-                it_assert_debug ( payload, "dereferencing NULL" );
+                bdm_assert_debug ( payload, "dereferencing NULL" );
                 return *payload;
         }
@@ -254 +254 @@
         */
         object_ptr ( const shared_ptr<T> &b ) : shared_ptr<T> ( b ) {
-                it_assert_debug ( this->get(), "object_ptr cannot be empty" );
+                bdm_assert_debug ( this->get(), "object_ptr cannot be empty" );
         }
 
@@ -262 +262 @@
         */
         object_ptr ( T *p ) : shared_ptr<T> ( p ) {
-                it_assert_debug ( p, "object_ptr cannot be empty" );
+                bdm_assert_debug ( p, "object_ptr cannot be empty" );
         }
 

library/bdm/stat/discrete.h

@@ -55 +55 @@
                         void initialize() {
                                 dim = ranges.length();
-                                it_assert_debug(gridsizes.length()==dim,"Incompatible dimensions of input");
+                                bdm_assert_debug(gridsizes.length() == dim, "Incompatible dimensions of input");
                                 Npoints = prod(gridsizes);
-                                it_assert_debug(Npoints>0,"Wrong input parameters");
+                                bdm_assert_debug(Npoints > 0, "Wrong input parameters");
                                 
                                 //precompute steps
@@ -71 +71 @@
                                 vec v ( dim );
                                 for ( int j = 0; j < dim; j++ ) {
-                                        it_assert_debug(inds(j)<gridsizes(j), "Index out of bounds");
+                                        bdm_assert_debug(inds(j) < gridsizes(j), "Index out of bounds");
                                         v ( j ) = ranges(j)(0) + (0.5+inds(j))*steps(j);
                                 }
@@ -80 +80 @@
                         long linear_index (const ivec inds){
                                 long ind=0;
-                                it_assert_debug(inds.length()==dim,"Improper indeces inds");
+                                bdm_assert_debug(inds.length() == dim, "Improper indices inds");
                                 int dim_skips=1; // skips in active dimension, in the first dimension, the skips are 1 index per value
                                                 

library/bdm/stat/emix.cpp

@@ -12 +12 @@
 
         for ( i = 0; i < w.length(); i++ ) {
-                it_assert_debug ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
-                it_assert_debug ( !isnamed || tmp_rv.equal ( Coms0 ( i )->_rv() ), "Component RVs do not match!" );
+                bdm_assert_debug ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
+                bdm_assert_debug ( !isnamed || tmp_rv.equal ( Coms0 ( i )->_rv() ), "Component RVs do not match!" );
         }
 
@@ -44 +44 @@
 
 void emix::marginal ( const RV &rv, emix &target ) const {
-        it_assert_debug ( isnamed(), "rvs are not assigned" );
+        bdm_assert_debug ( isnamed(), "rvs are not assigned" );
 
         Array<shared_ptr<epdf> > Cn ( Coms.length() );
@@ -55 +55 @@
 
 shared_ptr<mpdf> emix::condition ( const RV &rv ) const {
-        it_assert_debug ( isnamed(), "rvs are not assigned" );
+        bdm_assert_debug ( isnamed(), "rvs are not assigned" );
         mratio *tmp = new mratio ( this, rv );
         return shared_ptr<mpdf>(tmp);
@@ -65 +65 @@
         int i;
         for ( i = 0; i < w.length(); i++ ) {
-                it_assert_debug ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
+                bdm_assert_debug ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
         }
         if ( copy ) {
                 Coms.set_length ( Coms0.length() );
                 for ( i = 0; i < w.length(); i++ ) {
-                        it_error ( "Not imp..." );
-                        *Coms ( i ) = *Coms0 ( i );
+                        bdm_error ( "Not implemented" );
+                        // *Coms ( i ) = *Coms0 ( i );
                 }
                 destroyComs = true;
@@ -124 +124 @@
 
 void egiwmix::marginal ( const RV &rv, emix &target ) const {
-        it_assert_debug ( isnamed(), "rvs are not assigned" );
+        bdm_assert_debug ( isnamed(), "rvs are not assigned" );
 
         Array<shared_ptr<epdf> > Cn ( Coms.length() );
@@ -247 +247 @@
 //                      rvaddok=rv.add ( mpdfs ( i )->_rv() ); //add rv to common rvs.
 //                      // If rvaddok==false, mpdfs overlap => assert error.
-//                      it_assert_debug(rvaddok||overlap,"mprod::mprod() input mpdfs overlap in rv!");
 //                      epdfs ( i ) = & ( mpdfs ( i )->posterior() ); // add pointer to epdf
 //              };

library/bdm/stat/emix.h

@@ -62 +62 @@
                 //prepare data structures
                 if ( copy ) {
-                        it_error ( "todo" );
-                        destroynom = true;
+                        bdm_error ( "todo" );
+                        // destroynom = true;
                 } else {
                         nom = nom0;
                         destroynom = false;
                 }
-                it_assert_debug ( rvc.length() > 0, "Makes no sense to use this object!" );
+                bdm_assert_debug ( rvc.length() > 0, "Makes no sense to use this object!" );
 
                 // build denominator
@@ -156 +156 @@
                 }
                 double tmp = log ( sum );
-                it_assert_debug ( std::isfinite ( tmp ), "Infinite" );
+                bdm_assert_debug ( std::isfinite ( tmp ), "Infinite" );
                 return tmp;
         };
@@ -387 +387 @@
                         for ( int i = 0; i < epdfs.length(); i++ ) {
                                 independent = rv.add ( epdfs ( i )->_rv() );
-                                it_assert_debug ( independent == true, "eprod:: given components are not independent." );
+                                bdm_assert_debug ( independent, "eprod:: given components are not independent." );
                         }
                         dim = rv._dsize();
@@ -441 +441 @@
                         tmp += epdfs ( i )->evallog ( dls ( i )->pushdown ( val ) );
                 }
-                it_assert_debug ( std::isfinite ( tmp ), "Infinite" );
+                bdm_assert_debug ( std::isfinite ( tmp ), "Infinite" );
                 return tmp;
         }
         //!access function
         const epdf* operator () ( int i ) const {
-                it_assert_debug ( i < epdfs.length(), "wrong index" );
+                bdm_assert_debug ( i < epdfs.length(), "wrong index" );
                 return epdfs ( i );
         }

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

library/bdm/stat/exp_family.h

@@ -44 +44 @@
                 //! logarithm of the normalizing constant, \f$\mathcal{I}\f$
                 virtual double lognc() const = 0;
+
                 //!Evaluate normalized log-probability
-                virtual double evallog_nn (const vec &val) const{it_error ("Not implemented");return 0.0;};
+                virtual double evallog_nn (const vec &val) const {
+                        bdm_error ("Not implemented");
+                        return 0.0;
+                }
+
                 //!Evaluate normalized log-probability
                 virtual double evallog (const vec &val) const {
                         double tmp;
                         tmp = evallog_nn (val) - lognc();
-//                              it_assert_debug ( std::isfinite ( tmp ),"Infinite value" );
                         return tmp;
                 }
@@ -65 +69 @@
                         return x -lognc();
                 }
+
                 //!Power of the density, used e.g. to flatten the density
-                virtual void pow (double p) {it_error ("Not implemented");};
+                virtual void pow (double p) {
+                        bdm_error ("Not implemented");
+                }
 };
 
@@ -84 +91 @@
                 BMEF (const BMEF &B) : BM (B), frg (B.frg), last_lognc (B.last_lognc) {}
                 //!get statistics from another model
-                virtual void set_statistics (const BMEF* BM0) {it_error ("Not implemented");};
+                virtual void set_statistics (const BMEF* BM0) {
+                        bdm_error ("Not implemented");
+                }
+
                 //! Weighted update of sufficient statistics (Bayes rule)
                 virtual void bayes (const vec &data, const double w) {};
                 //original Bayes
                 void bayes (const vec &dt);
+
                 //!Flatten the posterior according to the given BMEF (of the same type!)
-                virtual void flatten (const BMEF * B) {it_error ("Not implemented");}
-                //!Flatten the posterior as if to keep nu0 data
-//      virtual void flatten ( double nu0 ) {it_error ( "Not implemented" );}
-
-                BMEF* _copy_ () const {it_error ("function _copy_ not implemented for this BM"); return NULL;};
+                virtual void flatten (const BMEF * B) {
+                        bdm_error ("Not implemented");
+                }
+
+                BMEF* _copy_ () const {
+                        bdm_error ("function _copy_ not implemented for this BM");
+                        return NULL;
+                }
 };
 
@@ -122 +136 @@
                 void from_setting (const Setting &root);
                 void validate() {
-                        it_assert (mu.length() == R.rows(), "parameters mismatch");
+                        bdm_assert_debug (mu.length() == R.rows(), "parameters mismatch");
                         dim = mu.length();
                 }
@@ -272 +286 @@
                 //!@}
 
-                vec sample() const {it_error ("Not implemented");return vec_1 (0.0);};
+                vec sample() const {
+                        bdm_error ("Not implemented");
+                        return vec();
+                }
+
                 vec mean() const {return beta / sum (beta);};
                 vec variance() const {double gamma = sum (beta); return elem_mult (beta, (beta + 1)) / (gamma* (gamma + 1));}
@@ -278 +296 @@
                 double evallog_nn (const vec &val) const {
                         double tmp; tmp = (beta - 1) * log (val);
-//                              it_assert_debug ( std::isfinite ( tmp ),"Infinite value" );
                         return tmp;
-                };
+                }
+
                 double lognc () const {
                         double tmp;
@@ -287 +305 @@
                         for (int i = 0;i < beta.length();i++) {lgb += lgamma (beta (i));}
                         tmp = lgb - lgamma (gam);
-//                              it_assert_debug ( std::isfinite ( tmp ),"Infinite value" );
                         return tmp;
-                };
+                }
+
                 //!access function
                 vec& _beta()  {return beta;}
@@ -397 +415 @@
                 }
                 void validate() {
-                        it_assert (alpha.length() == beta.length(), "parameters do not match");
+                        bdm_assert_debug (alpha.length() == beta.length(), "parameters do not match");
                         dim = alpha.length();
                 }
@@ -446 +464 @@
         void set_parameters( int &i, double wi, epdf* ep){w(i)=wi;Coms(i)=ep;}
         vec mean(){vec pom; for(int i=0;i<n;i++){pom+=Coms(i)->mean()*w(i);} return pom;};
-        vec sample() {it_error ( "Not implemented" );return 0;}
 };
 */
@@ -472 +489 @@
                 void set_parameters (const vec &low0, const vec &high0) {
                         distance = high0 - low0;
-                        it_assert_debug (min (distance) > 0.0, "bad support");
+                        bdm_assert_debug (min (distance) > 0.0, "bad support");
                         low = low0;
                         high = high0;
@@ -535 +552 @@
                 //! Set \c A and \c R
                 void set_parameters (const  mat &A0, const vec &mu0, const sq_T &R0) {
-                        it_assert_debug (A0.rows() == mu0.length(), "");
-                        it_assert_debug (A0.rows() == R0.rows(), "");
+                        bdm_assert_debug (A0.rows() == mu0.length(), "mlnorm: A vs. mu mismatch");
+                        bdm_assert_debug (A0.rows() == R0.rows(), "mlnorm: A vs. R mismatch");
 
                         this->iepdf.set_parameters (zeros (A0.rows()), R0);
@@ -660 +677 @@
                 //! constructor function
                 void set_parameters (const mat &A0, const vec &mu0, const ldmat &R0, const ldmat& Lambda0) {
-                        it_assert_debug (A0.rows() == mu0.length(), "");
-                        it_assert_debug (R0.rows() == A0.rows(), "");
+                        bdm_assert_debug (A0.rows() == mu0.length(), "mlstudent: A vs. mu mismatch");
+                        bdm_assert_debug (R0.rows() == A0.rows(), "mlstudent: A vs. R mismatch");
 
                         iepdf.set_parameters (mu0, Lambda);  //
@@ -1138 +1155 @@
                 //! Function performs resampling, i.e. removal of low-weight samples and duplication of high-weight samples such that the new samples represent the same density.
                 ivec resample (RESAMPLING_METHOD method = SYSTEMATIC);
-                //! inherited operation : NOT implemneted
-                vec sample() const {it_error ("Not implemented");return 0;}
-                //! inherited operation : NOT implemneted
-                double evallog (const vec &val) const {it_error ("Not implemented");return 0.0;}
+
+                //! inherited operation : NOT implemented
+                vec sample() const {
+                        bdm_error ("Not implemented");
+                        return vec();
+                }
+
+                //! inherited operation : NOT implemented
+                double evallog (const vec &val) const {
+                        bdm_error ("Not implemented");
+                        return 0.0;
+                }
+
                 vec mean() const {
                         vec pom = zeros (dim);
@@ -1279 +1305 @@
 void enorm<sq_T>::marginal ( const RV &rvn, enorm<sq_T> &target ) const
 {
-        it_assert_debug (isnamed(), "rv description is not assigned");
+        bdm_assert_debug (isnamed(), "rv description is not assigned");
         ivec irvn = rvn.dataind (rv);
 
@@ -1302 +1328 @@
         typedef mlnorm<sq_T> TMlnorm;
 
-        it_assert_debug (isnamed(), "rvs are not assigned");
+        bdm_assert_debug (isnamed(), "rvs are not assigned");
         TMlnorm &uptarget = dynamic_cast<TMlnorm &>(target);
 
         RV rvc = rv.subt (rvn);
-        it_assert_debug ( (rvc._dsize() + rvn._dsize() == rv._dsize()), "wrong rvn");
+        bdm_assert_debug ( (rvc._dsize() + rvn._dsize() == rv._dsize()), "wrong rvn");
         //Permutation vector of the new R
         ivec irvn = rvn.dataind (rv);

library/bdm/stat/merger.cpp

@@ -192 +192 @@
 
                         }
-                        //                      it_assert_debug(std::isfinite(sum(lw_src)),"bad");
+
                         lW.set_row ( i, lw_src ); // do not divide by mix
                 }

library/bdm/stat/merger.h

@@ -200 +200 @@
                         eSmp._w() = wtmp / sum ( wtmp );
                 } else {
-                        it_error ( "Sources are not compatible - use merger_mix" );
+                        bdm_error ( "Sources are not compatible - use merger_mix" );
                 }
         };
@@ -277 +277 @@
 
         void validate() {
-                it_assert ( eSmp._w().length() > 0, "Empty support, use set_support()." );
-                it_assert ( dim == eSmp._samples() ( 0 ).length(), "Support points and rv are not compatible!" );
-                it_assert ( isnamed(), "mergers must be named" );
+                bdm_assert ( eSmp._w().length() > 0, "Empty support, use set_support()." );
+                bdm_assert ( dim == eSmp._samples() ( 0 ).length(), "Support points and rv are not compatible!" );
+                bdm_assert ( isnamed(), "mergers must be named" );
         }
         //!@}

library/tests/shared_ptr_test.cpp

@@ -1 +1 @@
 #include "shared_ptr.h"
 #include "UnitTest++.h"
+#include <stdexcept>
 #include <vector>
 
@@ -51 +52 @@
         CHECK_EQUAL ( 2, v[2]->get_x() );
 }
+
+TEST ( test_shared_ptr_error ) {
+        bdm::shared_ptr<Foo> empty;
+        try {
+                Foo x(*empty);
+                CHECK ( false );
+        } catch ( std::runtime_error &exc ) {
+                CHECK ( exc.what() );
+        }
+}

library/tests/test_kalman.cpp

@@ -21 +21 @@
         bool xxx = fin.seek ( "d" );
         if ( !xxx ) {
-                it_error ( "testKF.it not found" );
+                bdm_error ( "testKF.it not found" );
         }
         fin >> Dt;

library/tests/test_kalman_QR.cpp

@@ -22 +22 @@
         bool xxx = fin.seek ( "d" );
         if ( !xxx ) {
-                it_error ( "testKF.it not found" );
+                bdm_error ( "testKF.it not found" );
         }
         fin >> Dt;

library/tests/test_kalman_QRexh.cpp

@@ -23 +23 @@
 
         if ( !xxx ) {
-                it_error ( "testKF.it not found" );
+                bdm_error ( "testKF.it not found" );
         }
 

library/tests/testsuite.cpp

@@ -2 +2 @@
 #include "TestReporterStdout.h"
 #include "UnitTest++.h"
+#include "bdmerror.h"
 #include "itpp_ext.h"
+#include <string.h>
 
 using namespace itpp;
@@ -9 +11 @@
 
 bool is_selected_test( const UnitTest::Test *test ) {
-        it_assert_debug ( test, "NULL test" );
+        bdm_assert_debug ( test, "NULL test" );
 
         if (!selected_tests.length()) {
@@ -17 +19 @@
         for (int i = 0; i < selected_tests.length(); ++i) {
                 const char *n = test->m_details.testName;
-                it_assert_debug ( n, "NULL test name" );
+                bdm_assert_debug ( n, "NULL test name" );
                 const char *sname = selected_tests(i);
-                it_assert_debug ( sname, "NULL selected test name" );
+                bdm_assert_debug ( sname, "NULL selected test name" );
                 if ( !strcmp ( n, sname ) ) {
                         return true;