Changeset 766 for library/bdm/stat/exp_family.h

Timestamp:

01/11/10 22:55:57 (14 years ago)

Author:

mido

Message:

abstract methods restored wherever they are meaningful
macros NOT_IMPLEMENTED and NOT_IMPLEMENTED_VOID defined to make sources shorter
emix::set_parameters and mmix::set_parameters removed, corresponding acces methods created and the corresponding validate methods improved appropriately
some compilator warnings were avoided
and also a few other things cleaned up

Files:

• library/bdm/stat/exp_family.h (modified) (9 diffs)

library/bdm/stat/exp_family.h

@@ -44 +44 @@
 
         //!Evaluate normalized log-probability
-        virtual double evallog_nn ( const vec &val ) const {
-                bdm_error ( "Not implemented" );
-                return 0.0;
-        }
+        virtual double evallog_nn ( const vec &val ) const NOT_IMPLEMENTED(0);
 
         //!Evaluate normalized log-probability
@@ -73 +70 @@
 
         //!Power of the density, used e.g. to flatten the density
-        virtual void pow ( double p ) {
-                bdm_error ( "Not implemented" );
-        }
+        virtual void pow ( double p ) NOT_IMPLEMENTED_VOID;
 };
 
@@ -92 +87 @@
         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 ) {
-                bdm_error ( "Not implemented" );
-        }
+        virtual void set_statistics ( const BMEF* BM0 ) NOT_IMPLEMENTED_VOID;
 
         //! Weighted update of sufficient statistics (Bayes rule)
@@ -102 +95 @@
 
         //!Flatten the posterior according to the given BMEF (of the same type!)
-        virtual void flatten ( const BMEF * B ) {
-                bdm_error ( "Not implemented" );
-        }
-
-        BMEF* _copy_ () const {
-                bdm_error ( "function _copy_ not implemented for this BM" );
-                return NULL;
-        }
+        virtual void flatten ( const BMEF * B ) NOT_IMPLEMENTED_VOID;
+
+        double logpred ( const vec &yt ) const NOT_IMPLEMENTED(0);
+        
+        virtual epdf* epredictor() const NOT_IMPLEMENTED(NULL);
+
+        virtual pdf* predictor() const NOT_IMPLEMENTED(NULL);
 
         void to_setting ( Setting &set ) const
         {                       
                 BM::to_setting( set );
-                // TODO DOPLNIT? CHYBI FROM_SETTING PRO INSPIRACI
+                // TODO DOPLNIT? ALE MOMENTALNE CHYBI FROM_SETTING PRO INSPIRACI
         } 
 };
@@ -1112 +1104 @@
         //! Constructor
         migamma_ref () : migamma (), refl () {};
+        
         //! Set value of \c k
         void set_parameters ( double k0 , vec ref0, double l0 ) {
@@ -1266 +1259 @@
                 return X*Y._Ch();// return upper triangular part of the decomposition
         }
+
         vec sample () const {
                 return vec ( sample_mat()._data(), p*p );
         }
+
+        virtual vec mean() const NOT_IMPLEMENTED(0);
+
+        //! return expected variance (not covariance!)
+        virtual vec variance() const NOT_IMPLEMENTED(0);
+
+        virtual double evallog ( const vec &val ) const NOT_IMPLEMENTED(0);
+
         //! fast access function y0 will be copied into Y.Ch.
         void setY ( const mat &Ch0 ) {
                 copy_vector ( dim, Ch0._data(), Y._Ch()._data() );
         }
+
         //! fast access function y0 will be copied into Y.Ch.
         void _setY ( const vec &ch0 ) {
                 copy_vector ( dim, ch0._data(), Y._Ch()._data() );
         }
+
         //! access function
         const chmat& getY() const {
@@ -1321 +1325 @@
                 W.setY ( iCh );
         }
+
         virtual double evallog ( const vec &val ) const {
                 chmat X ( p );
@@ -1345 +1350 @@
         };
 
+        virtual vec mean() const NOT_IMPLEMENTED(0);
+
+        //! return expected variance (not covariance!)
+        virtual vec variance() const NOT_IMPLEMENTED(0);
 };
 
@@ -1464 +1473 @@
 
         //! inherited operation : NOT implemented
-        vec sample() const {
-                bdm_error ( "Not implemented" );
-                return vec();
-        }
+        vec sample() const NOT_IMPLEMENTED(0);
 
         //! inherited operation : NOT implemented
-        double evallog ( const vec &val ) const {
-                bdm_error ( "Not implemented" );
-                return 0.0;
-        }
+        double evallog ( const vec &val ) const NOT_IMPLEMENTED(0);
 
         vec mean() const {