Changeset 565 for library/bdm/stat

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

Files:

• discrete.h (modified) (3 diffs)
• emix.cpp (modified) (6 diffs)
• emix.h (modified) (4 diffs)
• exp_family.cpp (modified) (9 diffs)
• exp_family.h (modified) (15 diffs)
• merger.cpp (modified) (1 diff)
• merger.h (modified) (2 diffs)

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" );
         }
         //!@}