Changeset 124

Timestamp:

06/20/08 11:16:12 (17 years ago)

Author:

smidl

Message:

zmeny v mmix

Location:

bdm/stat

Files:

• emix.cpp (modified) (1 diff)
• emix.h (modified) (1 diff)
• libEF.h (modified) (1 diff)

bdm/stat/emix.cpp

@@ -3 +3 @@
 using namespace itpp;
 
-void emix::set_parameters ( const vec &w0, const Array<epdf*> &Coms0 ){
+void emix::set_parameters ( const vec &w0, const Array<epdf*> &Coms0 ) {
         w = w0;
         int i;
-        for(i=0;i<w.length();i++){it_assert_debug(rv.equal(Coms0(i)->_rv()),"RVs do not match!"); }
+        for ( i=0;i<w.length();i++ ) {
+                epdf* Mp=Coms0 ( i );
+                it_assert_debug ( rv.equal ( Coms0 ( i )->_rv() ),"RVs do not match!" );
+        }
         Coms = Coms0;
 }
 
-vec emix::sample() const{
-        //Sample which component 
+vec emix::sample() const {
+        //Sample which component
         vec cumDist = cumsum ( w );
         double u0 = UniRNG.sample();
 
         int i=0;
-        while ((w(i)<u0) && (i<(w.length()-1))){i++;}
-        
-        return Coms(i)->sample();
+        while ( ( w ( i ) <u0 ) && ( i< ( w.length()-1 ) ) ) {i++;}
+
+        return Coms ( i )->sample();
 }

bdm/stat/emix.h

@@ -69 +69 @@
         Array<mpdf*> mpdfs;
 public:
-        
-        
+
+
 };
 
+/*! \brief Mixture of mpdfs with constant weights
+
+*/
+class mmix : public mpdf {
+protected:
+        //! Component (epdfs)
+        Array<mpdf*> Coms;
+        //!Internal epdf
+        emix Epdf;
+public:
+        //!Default constructor
+        mmix ( RV &rv, RV &rvc ) : mpdf ( rv, rvc ), Epdf ( rv ) {ep=&Epdf;};
+        //! Set weights \c w and components \c R
+        void set_parameters ( const vec &w, const Array<mpdf*> &Coms ) {
+                Array<epdf*> Eps ( Coms.length());
+
+                for ( int i=0;i<Coms.length();i++ ) {mpdf* Ci=Coms(i);
+                 Eps ( i ) =& ( Coms ( i )->_epdf() );}
+                Epdf.set_parameters ( w,Eps );
+        };
+
+        void condition ( const vec &cond ) {
+                for ( int i=0;i<Coms.length();i++ ) {Coms ( i )->condition ( cond );}
+        };
+};
 #endif //MX_H

bdm/stat/libEF.h

@@ -412 +412 @@
 
 template<class sq_T>
-mlnorm<sq_T>::mlnorm ( RV &rv0,RV &rvc0 ) :mEF ( rv0,rvc0 ),epdf ( rv ),A ( rv0.count(),rv0.count() ),_mu(epdf._mu()) {
+mlnorm<sq_T>::mlnorm ( RV &rv0,RV &rvc0 ) :mEF ( rv0,rvc0 ),epdf ( rv0 ),A ( rv0.count(),rv0.count() ),_mu(epdf._mu()) { ep =&epdf;
 }