Changeset 565 for library/bdm/base

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/base

Files:

• bdmbase.cpp (modified) (10 diffs)
• bdmbase.h (modified) (19 diffs)
• datasources.cpp (modified) (4 diffs)
• datasources.h (modified) (4 diffs)
• loggers.cpp (modified) (1 diff)
• loggers.h (modified) (2 diffs)
• user_info.cpp (modified) (3 diffs)
• user_info.h (modified) (2 diffs)

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