Changeset 183 for bdm/stat

Timestamp:

10/17/08 10:28:16 (16 years ago)

Author:

smidl

Message:

Universal merging tool is (almost) finished

Location:

bdm/stat

Files:

• emix.cpp (modified) (1 diff)
• emix.h (modified) (2 diffs)
• libBM.h (modified) (1 diff)
• libEF.h (modified) (3 diffs)

bdm/stat/emix.cpp

@@ -35 +35 @@
         for(int i=0;i<Coms.length();i++){Cn(i)=Coms(i)->marginal(rv);}
         emix* tmp = new emix(rv);
-        tmp->set_parameters(w,Coms,false);
+        tmp->set_parameters(w,Cn,false);
         tmp->ownComs();
         return tmp;

bdm/stat/emix.h

@@ -57 +57 @@
                         den = nom->marginal(rvc);
                 };
-                double evalcond(const vec &val, const vec &cond) const {
+                double evalcond(const vec &val, const vec &cond) {
                         return exp(nom->evalpdflog(concat(val,cond)) - den->evalpdflog(cond));
                 }
@@ -100 +100 @@
                 int i;
                 double sum = 0.0;
-                for ( i = 0;i < w.length();i++ ) {sum += w ( i ) * Coms ( i )->evalpdflog ( val );}
+                for ( i = 0;i < w.length();i++ ) {sum += w ( i ) * exp(Coms ( i )->evalpdflog ( val ));}
                 return log ( sum );
         };

bdm/stat/libBM.h

@@ -182 +182 @@
         }
         //! Return conditional density on the given RV, the remaining rvs will be in conditioning
-        virtual mpdf* condition(const RV &rv) const {it_warning("Not implemented"); return NULL;}
+        virtual mpdf* condition(const RV &rv) const  {it_warning("Not implemented"); return NULL;}
         //! Return marginal density on the given RV, the remainig rvs are intergrated out
-        epdf* marginal(const RV &rv) const {it_warning("Not implemented"); return NULL;}
+        virtual epdf* marginal(const RV &rv) const {it_warning("Not implemented"); return NULL;}
 
         //! return expected value

bdm/stat/libEF.h

@@ -130 +130 @@
         double lognc () const;
         vec mean() const {return mu;}
-        mlnorm<sq_T>* condition ( const RV &rvn ) const ;
-        enorm<sq_T>* marginal ( const RV &rv ) const;
+//      mlnorm<sq_T>* condition ( const RV &rvn ) const ;
+        mpdf* condition ( const RV &rvn ) const ;
+//      enorm<sq_T>* marginal ( const RV &rv ) const;
+        epdf* marginal ( const RV &rv ) const;
 //Access methods
         //! returns a pointer to the internal mean value. Use with Care!
@@ -597 +599 @@
 
 template<class sq_T>
-enorm<sq_T>* enorm<sq_T>::marginal ( const RV &rvn ) const {
+epdf* enorm<sq_T>::marginal ( const RV &rvn ) const {
         ivec irvn = rvn.dataind ( rv );
 
@@ -607 +609 @@
 
 template<class sq_T>
-mlnorm<sq_T>* enorm<sq_T>::condition ( const RV &rvn ) const {
+mpdf* enorm<sq_T>::condition ( const RV &rvn ) const {
 
         RV rvc = rv.subt ( rvn );