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

Timestamp:

08/12/09 09:27:40 (15 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.h (modified) (7 diffs)

library/bdm/stat/emix.h

@@ -39 +39 @@
         //! Nominator in the form of mpdf
         const epdf* nom;
+
         //!Denominator in the form of epdf
-        epdf* den;
+        shared_ptr<epdf> den;
+
         //!flag for destructor
         bool destroynom;
@@ -85 +87 @@
         //! Default destructor
         ~mratio() {
-                delete den;
                 if ( destroynom ) {
                         delete nom;
@@ -107 +108 @@
         vec w;
         //! Component (epdfs)
-        Array<epdf*> Coms;
-        //!Flag if owning Coms
-        bool destroyComs;
+        Array<shared_ptr<epdf> > Coms;
+
 public:
         //!Default constructor
@@ -115 +115 @@
         //! Set weights \c w and components \c Coms
         //!By default Coms are copied inside. Parameter \c copy can be set to false if Coms live externally. Use method ownComs() if Coms should be destroyed by the destructor.
-        void set_parameters ( const vec &w, const Array<epdf*> &Coms, bool copy = false );
+        void set_parameters ( const vec &w, const Array<shared_ptr<epdf> > &Coms );
 
         vec sample() const;
@@ -164 +164 @@
         };
 
-        emix* marginal ( const RV &rv ) const;
-        mratio* condition ( const RV &rv ) const; //why not mratio!!
+        shared_ptr<epdf> marginal ( const RV &rv ) const;
+        void marginal ( const RV &rv, emix &target ) const;
+        shared_ptr<mpdf> condition ( const RV &rv ) const;
 
 //Access methods
@@ -172 +173 @@
                 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;
-        }
 
         //!access function
-        epdf* _Coms ( int i ) {
+        shared_ptr<epdf> _Coms ( int i ) {
                 return Coms ( i );
         }
+
         void set_rv ( const RV &rv ) {
                 epdf::set_rv ( rv );
@@ -233 +224 @@
         double lognc () const {
                 return 0;
-        };
-        emix* marginal ( const RV &rv ) const;
+        }
+
+        shared_ptr<epdf> marginal ( const RV &rv ) const;
+        void marginal ( const RV &rv, emix &target ) const;
 
 //Access methods