Changeset 504 for library/bdm/stat/emix.cpp

Timestamp:

08/12/09 09:27:40 (16 years ago)

Author:

vbarta

Message:

returning shared pointers from epdf::marginal & epdf::condition; testsuite run leaks down from 8402 to 6510 bytes

Files:

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

library/bdm/stat/emix.cpp

@@ -3 +3 @@
 namespace bdm {
 
-void emix::set_parameters ( const vec &w0, const Array<epdf*> &Coms0, bool copy ) {
+void emix::set_parameters ( const vec &w0, const Array<shared_ptr<epdf> > &Coms0 ) {
         w = w0 / sum ( w0 );
         dim = Coms0 ( 0 )->dimension();
@@ -14 +14 @@
                 it_assert_debug ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
                 it_assert_debug ( !isnamed || tmp_rv.equal ( Coms0 ( i )->_rv() ), "Component RVs do not match!" );
+        }
+
+        Coms = Coms0;
+
+        if ( isnamed ) epdf::set_rv ( tmp_rv ); //coms aer already OK, no need for set_rv
+}
+
+vec emix::sample() const {
+        //Sample which component
+        vec cumDist = cumsum ( w );
+        double u0;
+#pragma omp critical
+        u0 = UniRNG.sample();
+
+        int i = 0;
+        while ( ( cumDist ( i ) < u0 ) && ( i < ( w.length() - 1 ) ) ) {
+                i++;
+        }
+
+        return Coms ( i )->sample();
+}
+
+shared_ptr<epdf> emix::marginal ( const RV &rv ) const {
+        emix *tmp = new emix();
+        shared_ptr<epdf> narrow(tmp);
+        marginal ( rv, *tmp );
+        return narrow;
+}
+
+void emix::marginal ( const RV &rv, emix &target ) const {
+        it_assert_debug ( isnamed(), "rvs are not assigned" );
+
+        Array<shared_ptr<epdf> > Cn ( Coms.length() );
+        for ( int i = 0; i < Coms.length(); i++ ) {
+                Cn ( i ) = Coms ( i )->marginal ( rv );
+        }
+
+        target.set_parameters ( w, Cn );
+}
+
+shared_ptr<mpdf> emix::condition ( const RV &rv ) const {
+        it_assert_debug ( isnamed(), "rvs are not assigned" );
+        mratio *tmp = new mratio ( this, rv );
+        return shared_ptr<mpdf>(tmp);
+}
+
+void egiwmix::set_parameters ( const vec &w0, const Array<egiw*> &Coms0, bool copy ) {
+        w = w0 / sum ( w0 );
+        dim = Coms0 ( 0 )->dimension();
+        int i;
+        for ( i = 0; i < w.length(); i++ ) {
+                it_assert_debug ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
         }
         if ( copy ) {
@@ -26 +78 @@
                 destroyComs = false;
         }
-        if ( isnamed ) epdf::set_rv ( tmp_rv ); //coms aer already OK, no need for set_rv
-}
-
-vec emix::sample() const {
-        //Sample which component
-        vec cumDist = cumsum ( w );
-        double u0;
-#pragma omp critical
-        u0 = UniRNG.sample();
-
-        int i = 0;
-        while ( ( cumDist ( i ) < u0 ) && ( i < ( w.length() - 1 ) ) ) {
-                i++;
-        }
-
-        return Coms ( i )->sample();
-}
-
-emix* emix::marginal ( const RV &rv ) const {
-        it_assert_debug ( isnamed(), "rvs are not assigned" );
-
-        Array<epdf*> Cn ( Coms.length() );
-        for ( int i = 0; i < Coms.length(); i++ ) {
-                Cn ( i ) = Coms ( i )->marginal ( rv );
-        }
-        emix* tmp = new emix();
-        tmp->set_parameters ( w, Cn, false );
-        tmp->ownComs();
-        return tmp;
-}
-
-mratio* emix::condition ( const RV &rv ) const {
-        it_assert_debug ( isnamed(), "rvs are not assigned" );
-        return new mratio ( this, rv );
-};
-
-void egiwmix::set_parameters ( const vec &w0, const Array<egiw*> &Coms0, bool copy ) {
-        w = w0 / sum ( w0 );
-        dim = Coms0 ( 0 )->dimension();
-        int i;
-        for ( i = 0; i < w.length(); i++ ) {
-                it_assert_debug ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
-        }
-        if ( copy ) {
-                Coms.set_length ( Coms0.length() );
-                for ( i = 0; i < w.length(); i++ ) {
-                        it_error ( "Not imp..." );
-                        *Coms ( i ) = *Coms0 ( i );
-                }
-                destroyComs = true;
-        } else {
-                Coms = Coms0;
-                destroyComs = false;
-        }
 }
 
@@ -118 +116 @@
 }
 
-emix* egiwmix::marginal ( const RV &rv ) const {
+shared_ptr<epdf> egiwmix::marginal ( const RV &rv ) const {
+        emix *tmp = new emix();
+        shared_ptr<epdf> narrow(tmp);
+        marginal ( rv, *tmp );
+        return narrow;
+}
+
+void egiwmix::marginal ( const RV &rv, emix &target ) const {
         it_assert_debug ( isnamed(), "rvs are not assigned" );
 
-        Array<epdf*> Cn ( Coms.length() );
+        Array<shared_ptr<epdf> > Cn ( Coms.length() );
         for ( int i = 0; i < Coms.length(); i++ ) {
                 Cn ( i ) = Coms ( i )->marginal ( rv );
         }
-        emix* tmp = new emix();
-        tmp->set_parameters ( w, Cn, false );
-        tmp->ownComs();
-        return tmp;
+
+        target.set_parameters ( w, Cn );
 }