Changeset 766 for library/bdm/stat/emix.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/emix.h (modified) (10 diffs)

library/bdm/stat/emix.h

@@ -53 +53 @@
                 // adjust rv and rvc
 
-                set_rv ( rv ); // TODO co kdyby tohle samo uz nastavovalo dimension?!?!
+                set_rv ( rv ); 
                 dim = rv._dsize();
 
@@ -81 +81 @@
                 return tmp;
         }
+
+        //! 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 ) NOT_IMPLEMENTED(0);
+
         //! Object takes ownership of nom and will destroy it
         void ownnom() {
@@ -91 +95 @@
                 }
         }
+
+
+
 
 private:
@@ -120 +127 @@
         emix ( ) : epdf ( ) { }
 
-        /*!
-          \brief Set weights \c w and components \c Coms
-
-          Shared pointers in Coms are kept inside this instance and
-          shouldn't be modified after being passed to this method.
-        */
-        void set_parameters ( const vec &w, const Array<shared_ptr<epdf> > &Coms );
-    
         virtual void validate ();
 
@@ -148 +147 @@
         shared_ptr<pdf> condition ( const RV &rv ) const;
 
-        //Access methods
-        //! returns a pointer to the internal mean value. Use with Care!
+        //Access methods        
+        //! returns a reference to the internal weights. Use with Care!
         vec& _w() {
                 return w;
         }
 
-        //!access function
+        /*!
+          \brief returns a reference to the internal array of components. Use with Care! Set components \c Coms
+
+          Shared pointers in Coms are kept inside this instance and
+          shouldn't be modified after being passed to this method.
+        */
+        Array<shared_ptr<epdf>>& _Coms ( ) {
+                return Coms;
+        }
+
+        //! returns a reference to the internal components specified by index i. Use with Care!
         shared_ptr<epdf> _Coms ( int i ) {
                 return Coms ( i );
@@ -174 +183 @@
         //! \endcode
         //!@}
-        void from_setting ( const Setting &set ) {
-
-                vec w0;
-                Array<shared_ptr<epdf> > Coms0;
-
-                UI::get ( Coms0, set, "pdfs", UI::compulsory );
-
-                if ( !UI::get ( w0, set, "weights", UI::optional ) ) {
-                        int len = Coms.length();
-                        w0.set_length ( len );
-                        w0 = 1.0 / len;
-                }
-
-                // TODO asi lze nacitat primocare do w a coms, jen co bude hotovy validate()
-                set_parameters ( w0, Coms0 );
-                validate();
-        }
+        void from_setting ( const Setting &set );
 };
 SHAREDPTR ( emix );
@@ -284 +277 @@
         //! Data link for each pdfs
         Array<shared_ptr<datalink_m2m> > dls;
-
-protected:
-        //! dummy epdf used only as storage for RV and dim
-        epdf iepdf;
 
 public:
@@ -330 +319 @@
         //!@}
         void from_setting ( const Setting &set ) {
-                Array<shared_ptr<pdf> > atmp; //temporary Array
-                UI::get ( atmp, set, "pdfs", UI::compulsory );
-                set_elements ( atmp );
+                Array<shared_ptr<pdf> > temp_array; 
+                UI::get ( temp_array, set, "pdfs", UI::compulsory );
+                set_elements ( temp_array );
         }
 };
@@ -418 +407 @@
         mmix() : Coms ( 0 ) { }
 
-        //! Set weights \c w and components \c R
-        void set_parameters ( const vec &w0, const Array<shared_ptr<pdf> > &Coms0 ) {
-                //!\todo check if all components are OK
-                Coms = Coms0;
-                w = w0;
-
-                if ( Coms0.length() > 0 ) {
-                        set_rv ( Coms ( 0 )->_rv() );
-                        dim = rv._dsize();
-                        set_rvc ( Coms ( 0 )->_rvc() );
-                        dimc = rvc._dsize();
-                }
-        }
         double evallogcond ( const vec &dt, const vec &cond ) {
                 double ll = 0.0;
@@ -449 +425 @@
         //! \endcode
         //!@}
-        void from_setting ( const Setting &set ) {
-                UI::get ( Coms, set, "pdfs", UI::compulsory );
-
-                // TODO ma byt zde, ci ve validate()?
-                if ( Coms.length() > 0 ) {
-                        set_rv ( Coms ( 0 )->_rv() );
-                        dim = rv._dsize();
-                        set_rvc ( Coms ( 0 )->_rvc() );
-                        dimc = rvc._dsize();
-                }
-
-                if ( !UI::get ( w, set, "weights", UI::optional ) ) {
-                        int len = Coms.length();
-                        w.set_length ( len );
-                        w = 1.0 / len;
-                }
-        }
+        void from_setting ( const Setting &set );
+
+        virtual void validate();
 };
 SHAREDPTR ( mmix );