Changeset 504 for library/bdm/stat/exp_family.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/exp_family.h (modified) (4 diffs)

library/bdm/stat/exp_family.h

@@ -99 +99 @@
 };
 
-template<class sq_T, template <typename> class TEpdf >
+template<class sq_T, template <typename> class TEpdf>
 class mlnorm;
 
@@ -142 +142 @@
                 vec variance() const {return diag (R.to_mat());}
 //      mlnorm<sq_T>* condition ( const RV &rvn ) const ; <=========== fails to cmpile. Why?
-                mpdf* condition (const RV &rvn) const ;
-                enorm<sq_T>* marginal (const RV &rv) const;
-//                      epdf* marginal ( const RV &rv ) const;
+                shared_ptr<mpdf> condition ( const RV &rvn ) const;
+
+                // target not typed to mlnorm<sq_T, enorm<sq_T> > &
+                // because that doesn't compile (perhaps because we
+                // haven't finished defining enorm yet), but the type
+                // is required
+                void condition ( const RV &rvn, mpdf &target ) const;
+
+                shared_ptr<epdf> marginal (const RV &rvn ) const;
+                void marginal ( const RV &rvn, enorm<sq_T> &target ) const;
                 //!@}
 
@@ -1235 +1242 @@
 
 template<class sq_T>
-enorm<sq_T>* enorm<sq_T>::marginal (const RV &rvn) const
+shared_ptr<epdf> enorm<sq_T>::marginal ( const RV &rvn ) const
+{
+        enorm<sq_T> *tmp = new enorm<sq_T> ();
+        shared_ptr<epdf> narrow(tmp);
+        marginal ( rvn, *tmp );
+        return narrow;
+}
+
+template<class sq_T>
+void enorm<sq_T>::marginal ( const RV &rvn, enorm<sq_T> &target ) const
 {
         it_assert_debug (isnamed(), "rv description is not assigned");
         ivec irvn = rvn.dataind (rv);
 
-        sq_T Rn (R, irvn);  //select rows and columns of R
-
-        enorm<sq_T>* tmp = new enorm<sq_T>;
-        tmp->set_rv (rvn);
-        tmp->set_parameters (mu (irvn), Rn);
-        return tmp;
+        sq_T Rn (R, irvn);  // select rows and columns of R
+
+        target.set_rv ( rvn );
+        target.set_parameters (mu (irvn), Rn);
 }
 
 template<class sq_T>
-mpdf* enorm<sq_T>::condition (const RV &rvn) const
-{
+shared_ptr<mpdf> enorm<sq_T>::condition ( const RV &rvn ) const
+{
+        mlnorm<sq_T> *tmp = new mlnorm<sq_T> ();
+        shared_ptr<mpdf> narrow(tmp);
+        condition ( rvn, *tmp );
+        return narrow;
+}
+
+template<class sq_T>
+void enorm<sq_T>::condition ( const RV &rvn, mpdf &target ) const
+{
+        typedef mlnorm<sq_T> TMlnorm;
 
         it_assert_debug (isnamed(), "rvs are not assigned");
+        TMlnorm &uptarget = dynamic_cast<TMlnorm &>(target);
 
         RV rvc = rv.subt (rvn);
@@ -1276 +1301 @@
         sq_T R_n (S11 - A *S12.T());
 
-        mlnorm<sq_T>* tmp = new mlnorm<sq_T> ();
-        tmp->set_rv (rvn); tmp->set_rvc (rvc);
-        tmp->set_parameters (A, mu1 - A*mu2, R_n);
-        return tmp;
+        uptarget.set_rv (rvn);
+        uptarget.set_rvc (rvc);
+        uptarget.set_parameters (A, mu1 - A*mu2, R_n);
 }