Changeset 527 for library/bdm/stat/exp_family.h

Timestamp:

08/13/09 15:58:32 (15 years ago)

Author:

vbarta

Message:

using shared_ptr in UI (optionally so far; loading & saving Array<T *> still works but should be phased out); testsuite run leaks down from 8822 to 480 bytes

Files:

• library/bdm/stat/exp_family.h (modified) (4 diffs)

library/bdm/stat/exp_family.h

@@ -236 +236 @@
                         UI::get (V, set, "V", UI::compulsory);
                         set_parameters (dimx, V, nu);
-                        RV* rv = UI::build<RV> (set, "rv", UI::compulsory);
+                        shared_ptr<RV> rv = UI::build<RV> (set, "rv", UI::compulsory);
                         set_rv (*rv);
-                        delete rv;
                 }
                 //!@}
@@ -574 +573 @@
 class mgnorm : public mpdf_internal< enorm< sq_T > >
 {
-        protected:
+        private:
 //                      vec &mu; WHY NOT?
-                fnc* g;
+                shared_ptr<fnc> g;
+
         public:
                 //!default constructor
                 mgnorm() : mpdf_internal<enorm<sq_T> >() { }
                 //!set mean function
-                inline void set_parameters (fnc* g0, const sq_T &R0);
+                inline void set_parameters (const shared_ptr<fnc> &g0, const sq_T &R0);
                 inline void condition (const vec &cond);
 
@@ -613 +613 @@
 
                 void from_setting (const Setting &set) {
-                        fnc* g = UI::build<fnc> (set, "g", UI::compulsory);
+                        shared_ptr<fnc> g = UI::build<fnc> (set, "g", UI::compulsory);
 
                         mat R;
@@ -1305 +1305 @@
 ///////
 template<class sq_T>
-void mgnorm<sq_T >::set_parameters (fnc* g0, const sq_T &R0) {g = g0; this->iepdf.set_parameters (zeros (g->dimension()), R0);}
+void mgnorm<sq_T >::set_parameters (const shared_ptr<fnc> &g0, const sq_T &R0) {
+        g = g0;
+        this->iepdf.set_parameters (zeros (g->dimension()), R0);
+}
+
 template<class sq_T>
 void mgnorm<sq_T >::condition (const vec &cond) {this->iepdf._mu() = g->eval (cond);};