Changeset 565 for library/bdm/base/bdmbase.h

Timestamp:

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

Author:

vbarta

Message:

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

Files:

• library/bdm/base/bdmbase.h (modified) (19 diffs)

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