Changeset 675 for library/bdm/stat/emix.h

Timestamp:

10/21/09 20:19:40 (15 years ago)

Author:

mido

Message:

experiment: epdf as a descendat of mpdf

Files:

• library/bdm/stat/emix.h (modified) (4 diffs)

library/bdm/stat/emix.h

@@ -47 +47 @@
         //!datalink between conditional and nom
         datalink_m2e dl;
-        //! dummy epdf that stores only rv and dim
-        epdf iepdf;
 public:
         //!Default constructor. By default, the given epdf is not copied!
         //! It is assumed that this function will be used only temporarily.
-        mratio ( const epdf* nom0, const RV &rv, bool copy = false ) : mpdf ( ), dl ( ),iepdf() {
+        mratio ( const epdf* nom0, const RV &rv, bool copy = false ) : mpdf ( ), dl ( ) {
                 // adjust rv and rvc
+
+                set_rv( rv ); // TODO co kdyby tohle samo uz nastavovalo dimension?!?!
+                dim = rv._dsize();
+
                 rvc = nom0->_rv().subt ( rv );
                 dimc = rvc._dsize();
-                set_ep ( iepdf );
-                iepdf.set_parameters ( rv._dsize() );
-                iepdf.set_rv ( rv );
-
+        
                 //prepare data structures
                 if ( copy ) {
@@ -74 +73 @@
                 dl.set_connection ( rv, rvc, nom0->_rv() );
         };
+
         double evallogcond ( const vec &val, const vec &cond ) {
                 double tmp;
@@ -469 +469 @@
         //!weights of the components
         vec w;
-        //! dummy epdfs
-        epdf dummy_epdf;
 public:
         //!Default constructor
-        mmix() : Coms(0), dummy_epdf() { set_ep(dummy_epdf);    }
+        mmix() : Coms(0) { }
 
         //! Set weights \c w and components \c R
@@ -483 +481 @@
                 if (Coms0.length()>0){
                         set_rv(Coms(0)->_rv());
-                        dummy_epdf.set_parameters(Coms(0)->_rv()._dsize());
+                        dim = rv._dsize();
                         set_rvc(Coms(0)->_rvc());
                         dimc = rvc._dsize();