Changeset 504 for library/bdm/base

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

Location:

library/bdm/base

Files:

• bdmbase.cpp (modified) (1 diff)
• bdmbase.h (modified) (1 diff)

library/bdm/base/bdmbase.cpp

@@ -134 +134 @@
 }
 
+shared_ptr<mpdf> epdf::condition (const RV &rv) const {
+        it_warning ("Not implemented");
+        return shared_ptr<mpdf>();
+}
+
+shared_ptr<epdf> epdf::marginal (const RV &rv) const {
+        it_warning ("Not implemented");
+        return shared_ptr<epdf>();
+}
+
 mat epdf::sample_m ( int N ) const {
         mat X = zeros ( dim, N );

library/bdm/base/bdmbase.h

@@ -317 +317 @@
 
                 //! 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 shared_ptr<mpdf> condition (const RV &rv) const;
 
                 //! Return marginal density on the given RV, the remainig rvs are intergrated out
-                virtual epdf* marginal (const RV &rv) const {
-                        it_warning ("Not implemented");
-                        return NULL;
-                }
+                virtual shared_ptr<epdf> marginal (const RV &rv) const;
 
                 //! return expected value