Changeset 214 for bdm/stat/libEF.h

Timestamp:

11/27/08 23:31:48 (15 years ago)

Author:

smidl

Message:

debug asserts for infinite likelihoods

Files:

• bdm/stat/libEF.h (modified) (5 diffs)

bdm/stat/libEF.h

@@ -48 +48 @@
         virtual double evallog_nn ( const vec &val ) const{it_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),"why?"); return tmp;}
+        virtual double evallog ( const vec &val ) const {double tmp;tmp= evallog_nn ( val )-lognc();it_assert_debug(std::isfinite(tmp),"Infinite value"); return tmp;}
         //!Evaluate normalized log-probability for many samples
         virtual vec evallog ( const mat &Val ) const {
@@ -128 +128 @@
         //! TODO is it used?
         mat sample ( int N ) const;
-        double eval ( const vec &val ) const ;
+//      double eval ( const vec &val ) const ;
         double evallog_nn ( const vec &val ) const;
         double lognc () const;
@@ -227 +227 @@
         vec mean() const {return beta/sum ( beta );};
         //! In this instance, val is ...
-        double evallog_nn ( const vec &val ) const {return ( beta-1 ) *log ( val );};
+        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;
                 double gam=sum ( beta );
                 double lgb=0.0;
                 for ( int i=0;i<beta.length();i++ ) {lgb+=lgamma ( beta ( i ) );}
-                return lgb-lgamma ( gam );
+                tmp= lgb-lgamma ( gam );
+                it_assert_debug(std::isfinite(tmp),"Infinite value");
+                return tmp;
         };
         //!access function
@@ -255 +259 @@
 public:
         //!Default constructor
-        multiBM ( const RV &rv, const vec beta0 ) : BMEF ( rv ),est ( rv,beta0 ),beta ( est._beta() ) {last_lognc=est.lognc();}
+        multiBM ( const RV &rv, const vec beta0 ) : BMEF ( rv ),est ( rv,beta0 ),beta ( est._beta() ) {if(beta.length()>0){last_lognc=est.lognc();}else{last_lognc=0.0;}}
         //!Copy constructor
         multiBM ( const multiBM &B ) : BMEF ( B ),est ( rv,B.beta ),beta ( est._beta() ) {}
@@ -596 +600 @@
 };
 
-template<class sq_T>
-double enorm<sq_T>::eval ( const vec &val ) const {
-        double pdfl,e;
-        pdfl = evallog ( val );
-        e = exp ( pdfl );
-        return e;
-};
+// template<class sq_T>
+// double enorm<sq_T>::eval ( const vec &val ) const {
+//      double pdfl,e;
+//      pdfl = evallog ( val );
+//      e = exp ( pdfl );
+//      return e;
+// };
 
 template<class sq_T>