Changeset 178 for bdm/stat/emix.h

Timestamp:

10/15/08 19:04:09 (16 years ago)

Author:

smidl

Message:

Changes in basic structures! new methods

Files:

• bdm/stat/emix.h (modified) (3 diffs)

bdm/stat/emix.h

@@ -36 +36 @@
         //! Component (epdfs)
         Array<epdf*> Coms;
+        //!Flag if owning Coms
+        bool destroyComs;
 public:
         //!Default constructor
-        emix ( RV &rv ) : epdf ( rv ) {};
-        //! Set weights \c w and components \c R
-        void set_parameters ( const vec &w, const Array<epdf*> &Coms );
+        emix (const RV &rv ) : epdf ( rv ) {};
+        //! Set weights \c w and components \c Coms , Coms are not copied!
+        void set_parameters ( const vec &w, const Array<epdf*> &Coms, bool copy=true );
 
         vec sample() const;
@@ -58 +60 @@
         //! returns a pointer to the internal mean value. Use with Care!
         vec& _w() {return w;}
+        virtual ~emix(){if (destroyComs){for(int i=0;i<Coms.length();i++){delete Coms(i);}}}
+        //! Auxiliary function for taking ownership of the Coms()
+        void ownComs(){destroyComs=true;}
 };
 
@@ -102 +107 @@
                 ll = 0;
                 for ( int i = ( n - 1 );i >= 0;i-- ) {
-                        if ( rvcinds ( i ).length() > 0 ) {
-                                condi = zeros ( rvcsinrv.length() + rvcinds.length() );
+                        if (( rvcinds ( i ).length() > 0 )||( rvcsinrv ( i ).length() > 0 )) {
+                                condi = zeros ( rvcsinrv(i).length() + rvcinds(i).length() );
                                 // copy data in condition
                                 set_subvector ( condi,rvcinds ( i ), cond );
                                 // copy data in already generated sample
-                                set_subvector ( condi,rvcsinrv ( i ), smp );
+                                set_subvector ( condi,rvinrvcs ( i ), get_vec(smp,rvcsinrv(i)) );
 
                                 mpdfs ( i )->condition ( condi );