Changeset 527

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

Location:

library

Files:

• bdm/base/bdmbase.cpp (modified) (1 diff)
• bdm/base/bdmbase.h (modified) (2 diffs)
• bdm/base/datasources.cpp (modified) (3 diffs)
• bdm/base/datasources.h (modified) (4 diffs)
• bdm/base/user_info.h (modified) (8 diffs)
• bdm/estim/arx.cpp (modified) (2 diffs)
• bdm/estim/kalman.cpp (modified) (4 diffs)
• bdm/estim/kalman.h (modified) (4 diffs)
• bdm/stat/emix.h (modified) (1 diff)
• bdm/stat/exp_family.h (modified) (4 diffs)
• tests/epdf_harness.cpp (modified) (1 diff)
• tests/mpdf_harness.cpp (modified) (1 diff)
• tests/square_mat_prep.cpp (modified) (3 diffs)
• tests/square_mat_stress.cpp (modified) (2 diffs)
• tests/test_kalman.cpp (modified) (1 diff)
• tests/user_info_test.cpp (modified) (5 diffs)

library/bdm/base/bdmbase.cpp

@@ -169 +169 @@
 
 void mpdf::from_setting ( const Setting &set ) {
-        RV *r = UI::build<RV> ( set, "rv" );
+        shared_ptr<RV> r = UI::build<RV> ( set, "rv", UI::optional );
         if ( r ) {
                 set_rv ( *r );
-                delete r;
-        }
-
-        r = UI::build<RV> ( set, "rvc" );
+        }
+
+        r = UI::build<RV> ( set, "rvc", UI::optional );
         if ( r ) {
                 set_rvc ( *r );
-                delete r;
         }
 }

library/bdm/base/bdmbase.h

@@ -379 +379 @@
                 //!@}
                 void from_setting (const Setting &set) {
-                        RV* r = UI::build<RV> (set, "rv");
+                        shared_ptr<RV> r = UI::build<RV> ( set, "rv", UI::optional );
                         if (r) {
                                 set_rv (*r);
-                                delete r;
                         }
                 }
@@ -455 +454 @@
                         return rvc;
                 }
-                int dimension() {
+
+                int dimension() const {
                         return ep->dimension();
                 }

library/bdm/base/datasources.cpp

@@ -57 +57 @@
 
 void ArxDS::from_setting ( const Setting &set ) {
-        RV *yrv = UI::build<RV> ( set, "y" , UI::compulsory );
-        RV *urv = UI::build<RV> ( set, "u" , UI::compulsory );
-        RV *rrv = UI::build<RV> ( set, "rgr" , UI::compulsory );
+        shared_ptr<RV> yrv = UI::build<RV> ( set, "y" , UI::compulsory );
+        shared_ptr<RV> urv = UI::build<RV> ( set, "u" , UI::compulsory );
+        shared_ptr<RV> rrv = UI::build<RV> ( set, "rgr" , UI::compulsory );
 
         mat Th;
@@ -112 +112 @@
 
 void ITppFileDS::from_setting ( const Setting &set ) {
-        RV* rvtmp = UI::build<RV> ( set, "rv" , UI::compulsory );
+        shared_ptr<RV> rvtmp = UI::build<RV> ( set, "rv" , UI::compulsory );
 
         it_file it ( set["filename"] );
@@ -131 +131 @@
         ut.set_length ( 0 );
 
+#if 0
         RV* rvtmp = UI::build<RV> ( set["IM"], "rvu", UI::compulsory );
         //set_drv(rvtmp);
+#endif
 }

library/bdm/base/datasources.h

@@ -173 +173 @@
         };
         //! Set
-        void set_drv ( RV &yrv, RV &urv, RV &rrv ) {
+        void set_drv ( const RV &yrv, const RV &urv, const RV &rrv ) {
                 Rrv = rrv;
                 Urv = urv;
@@ -265 +265 @@
 
 class stateDS : public DS {
+private:
+        //!conditional pdf of the state evolution \f$ f(x_t|x_{t-1}) \f$
+        shared_ptr<mpdf> IM;
+
+        //!conditional pdf of the observations \f$ f(d_t|x_t) \f$
+        shared_ptr<mpdf> OM;
+
 protected:
-        //!conditional pdf of the state evolution \f$ f(x_t|x_{t-1}) \f$
-        mpdf* IM;
-        //!conditional pdf of the observations \f$ f(d_t|x_t) \f$
-        mpdf* OM;
         //! result storage
         vec dt;
@@ -278 +281 @@
         //! Logger
         int L_xt;
+
 public:
         void getdata ( vec &dt0 ) {
@@ -286 +290 @@
         }
 
-        stateDS ( mpdf* IM0, mpdf* OM0, int usize ) : DS ( ), IM ( IM0 ), OM ( OM0 ),
-                        dt ( OM0->dimension() ), xt ( IM0->dimension() ), ut ( usize ) {}
-
-        stateDS() {}
-
-        ~stateDS() {
-                delete IM;
-                delete OM;
-        }
+        stateDS ( const shared_ptr<mpdf> &IM0, const shared_ptr<mpdf> &OM0, int usize ) : IM ( IM0 ), OM ( OM0 ),
+                dt ( OM0->dimension() ), xt ( IM0->dimension() ),
+                ut ( usize ), L_xt(0) { }
+
+        stateDS() : L_xt(0) { }
+
         virtual void step() {
                 xt = IM->samplecond ( concat ( xt, ut ) );
                 dt = OM->samplecond ( concat ( xt, ut ) );
-        };
+        }
 
         virtual void log_add ( logger &L ) {

library/bdm/base/user_info.h

@@ -24 +24 @@
 #include "libconfig/libconfig.h++"
 #include "../bdmroot.h"
+#include "../shared_ptr.h"
 #include "itpp/itbase.h"
 
@@ -253 +254 @@
         static void assert_type ( const Setting &element, Setting::Type type );
 
-        //! Method assembling a typeless instance, it is implemented in descendant class ParticularUI<T>
+        /*!
+          \brief Method constructing a configured instance
+
+          The returned pointer must be allocated using operator new
+          (it's deleted at the end of its life cycle). The method is
+          implemented in descendant class ParticularUI<T>, which knows
+          the correct type T.
+        */
         virtual root* new_instance() const = 0;
 
@@ -274 +282 @@
         //! This method converts a Setting into a real scalar
         static void from_setting ( double &real, const Setting &element );
+
         //! This method converts a Setting into a class T descendant
         template<class T> static void from_setting ( T* &instance, const Setting &element ) {
@@ -287 +296 @@
                 const UI& related_UI = MappedUI::retrieve_ui ( class_name );
 
-                root* typeless_instance = related_UI.new_instance();
+                root *typeless_instance = related_UI.new_instance();
+                it_assert_debug ( typeless_instance, "UI::new_instance failed" );
 
                 instance = dynamic_cast<T*> ( typeless_instance );
-                if ( !instance )
+                if ( !instance ) {
+                        delete typeless_instance;
                         throw UIException ( "class " + class_name + " is not a descendant of the desired output class. Try to call the UI::build<T> function with a different type parameter.", link.result );
+                }
 
                 try {
@@ -301 +313 @@
         }
 
+        //! This method converts a Setting into a descendant of class
+        //! T, wrapped in an instance of shared_ptr<T> .
+        template<class T>
+        static void from_setting ( shared_ptr<T> &instance, const Setting &element ) {
+                T *tmp_inst = 0;
+                from_setting ( tmp_inst, element );
+                it_assert_debug ( tmp_inst, "UI::from_setting failed" );
+                instance = tmp_inst;
+        }
+
         //! This methods converts a Setting into a new templated array of type Array<T>
         template<class T> static void from_setting ( Array<T> &array_to_load, const Setting &element ) {
@@ -320 +342 @@
         //! The exception can help to find the place where the template is misused and also to correct it.
         template<class T> static void from_setting ( T &variable_to_load, const Setting &element ) {
-                throw UIException ( "from_setting is not implemented for this type", element );
+                std::string msg = "from_setting is not implemented for type ";
+                msg += typeid(T).name();
+                throw UIException ( msg, element );
         }
 
@@ -341 +365 @@
         //! The new instance of type T* is constructed and initialized with values stored in the Setting element[name]
         //!
-        //! If there is not any sub-element named #name, the null pointer is returned.
-        template<class T> static T* build ( const Setting &element, const string &name, SettingPresence settingPresence = optional ) {
+        //! If there is not any sub-element named #name and settingPresence is #optional, an empty shared_ptr<T> is returned. When settingPresence is #compulsory, the returned shared_ptr<T> is never empty (an exception is thrown when the object isn't found).
+        template<class T>
+        static shared_ptr<T> build ( const Setting &element, const string &name, SettingPresence settingPresence = optional ) {
                 if ( !element.exists ( name ) ) {
                         if ( settingPresence == optional )
-                                return NULL;
+                                return shared_ptr<T>();
                         else
                                 throw UIException ( "the compulsory Setting named \"" + name + "\" is missing", element );
                 }
 
-                T* instance;
+                shared_ptr<T> instance;
                 from_setting<T> ( instance, to_child_setting ( element, name ) );
                 return instance;
@@ -483 +508 @@
         }
 
+        template< class T> static void save ( const shared_ptr<T> &instance, Setting &element, const string &name = "" ) {
+                save<T> ( instance.get(), element, name );
+        }
+
         //! An Array<T> instance is stored in the new child Setting appended to the passed element
         template<class T> static void save ( const Array<T> &array_to_save, Setting &element, const string &name = "" ) {

library/bdm/estim/arx.cpp

@@ -194 +194 @@
 
 void ARX::from_setting ( const Setting &set ) {
-        RV *yrv = UI::build<RV> ( set, "y", UI::compulsory );
-        RV *rrv = UI::build<RV> ( set, "rgr", UI::compulsory );
+        shared_ptr<RV> yrv = UI::build<RV> ( set, "y", UI::compulsory );
+        shared_ptr<RV> rrv = UI::build<RV> ( set, "rgr", UI::compulsory );
         int ylen = yrv->_dsize();
         int rgrlen = rrv->_dsize();
@@ -220 +220 @@
         //name results (for logging)
         set_rv ( RV ( "{theta r }", vec_2 ( ylen*rgrlen, ylen*ylen ) ) );
-
-        delete yrv;
-        delete rrv;
-}
-
-}
+}
+
+}

library/bdm/estim/kalman.cpp

@@ -64 +64 @@
 EKFfull::EKFfull ( ) : BM (), E() {};
 
-void EKFfull::set_parameters ( diffbifn* pfxu0,  diffbifn* phxu0, const mat Q0, const mat R0 ) {
+void EKFfull::set_parameters ( const shared_ptr<diffbifn> &pfxu0, const shared_ptr<diffbifn> &phxu0, const mat Q0, const mat R0 ) {
         pfxu = pfxu0;
         phxu = phxu0;
@@ -168 +168 @@
 
 
-void EKFCh::set_parameters ( diffbifn* pfxu0,  diffbifn* phxu0, const chmat Q0, const chmat R0 ) {
+void EKFCh::set_parameters ( const shared_ptr<diffbifn> &pfxu0, const shared_ptr<diffbifn> &phxu0, const chmat Q0, const chmat R0 ) {
         pfxu = pfxu0;
         phxu = phxu0;
@@ -255 +255 @@
 
 void EKFCh::from_setting ( const Setting &set ) {
-        diffbifn* IM = UI::build<diffbifn> ( set, "IM", UI::compulsory );
-        diffbifn* OM = UI::build<diffbifn> ( set, "OM", UI::compulsory );
+        shared_ptr<diffbifn> IM = UI::build<diffbifn> ( set, "IM", UI::compulsory );
+        shared_ptr<diffbifn> OM = UI::build<diffbifn> ( set, "OM", UI::compulsory );
 
         //statistics
@@ -280 +280 @@
 
         //connect
-        RV* drv = UI::build<RV> ( set, "drv", UI::compulsory );
+        shared_ptr<RV> drv = UI::build<RV> ( set, "drv", UI::compulsory );
         set_drv ( *drv );
-        RV* rv = UI::build<RV> ( set, "rv", UI::compulsory );
+        shared_ptr<RV> rv = UI::build<RV> ( set, "rv", UI::compulsory );
         set_rv ( *rv );
 

library/bdm/estim/kalman.h

@@ -190 +190 @@
 protected:
         //! Internal Model f(x,u)
-        diffbifn* pfxu;
+        shared_ptr<diffbifn> pfxu;
+
         //! Observation Model h(x,u)
-        diffbifn* phxu;
+        shared_ptr<diffbifn> phxu;
 
         enorm<fsqmat> E;
@@ -198 +199 @@
         //! Default constructor
         EKFfull ( );
+
         //! Set nonlinear functions for mean values and covariance matrices.
-        void set_parameters ( diffbifn* pfxu, diffbifn* phxu, const mat Q0, const mat R0 );
+        void set_parameters ( const shared_ptr<diffbifn> &pfxu, const shared_ptr<diffbifn> &phxu, const mat Q0, const mat R0 );
+
         //! Here dt = [yt;ut] of appropriate dimensions
         void bayes ( const vec &dt );
@@ -252 +255 @@
 protected:
         //! Internal Model f(x,u)
-        diffbifn* pfxu;
+        shared_ptr<diffbifn> pfxu;
+
         //! Observation Model h(x,u)
-        diffbifn* phxu;
+        shared_ptr<diffbifn> phxu;
 public:
         //! copy constructor duplicated - calls different set_parameters
@@ -264 +268 @@
         }
         //! Set nonlinear functions for mean values and covariance matrices.
-        void set_parameters ( diffbifn* pfxu, diffbifn* phxu, const chmat Q0, const chmat R0 );
+        void set_parameters ( const shared_ptr<diffbifn> &pfxu, const shared_ptr<diffbifn> &phxu, const chmat Q0, const chmat R0 );
+
         //! Here dt = [yt;ut] of appropriate dimensions
         void bayes ( const vec &dt );

library/bdm/stat/emix.h

@@ -355 +355 @@
         //!@}
         void from_setting ( const Setting &set ) {
-                Array<mpdf*> atmp; //temporary Array
+                Array<shared_ptr<mpdf> > atmp; //temporary Array
                 UI::get ( atmp, set, "mpdfs", UI::compulsory );
-                
-                Array<shared_ptr<mpdf> > btmp ( atmp.length() );
-                for (int i = 0; i < atmp.length(); ++i) {
-                        btmp ( i ) = shared_ptr<mpdf> ( atmp ( i ) );
-                }
-
-                set_elements ( btmp );
+                set_elements ( atmp );
         }
 

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);};

library/tests/epdf_harness.cpp

@@ -14 +14 @@
 
         UIFile in ( config_file_name );
-        Array<epdf_harness *> input;
+        Array<shared_ptr<epdf_harness> > input;
         UI::get ( input, in, "data", UI::compulsory );
         int sz = input.size();

library/tests/mpdf_harness.cpp

@@ -13 +13 @@
 
         UIFile in ( config_file_name );
-        Array<mpdf_harness *> input;
+        Array<shared_ptr<mpdf_harness> > input;
         UI::get ( input, in, "data", UI::compulsory );
         int sz = input.size();

library/tests/square_mat_prep.cpp

@@ -7 +7 @@
 #include <iostream>
 #include <iomanip>
-#include <memory>
 #include <stdlib.h>
 
@@ -62 +61 @@
                 cerr << "usage: " << argv[0] << " [ -g generator.cfg ] [ -a agenda_output.cfg ] [ -l agenda_length ]" << endl;
         } else {
-                Array<square_mat_point *> mag ( agenda_length );
+                Array<shared_ptr<square_mat_point> > mag ( agenda_length );
 
                 UIFile gspec ( generator_file_name );
-                auto_ptr<generator> gen ( UI::build<generator> ( gspec, "generator", UI::compulsory ) );
+                shared_ptr<generator> gen ( UI::build<generator> ( gspec, "generator", UI::compulsory ) );
                 for ( int i = 0; i < agenda_length; ++i ) {
                         mat m = gen->next();
@@ -76 +75 @@
                 UI::save ( mag, fag, "agenda" );
                 fag.save ( agenda_file_name );
-
-                for ( int i = 0; i < agenda_length; ++i ) {
-                        square_mat_point *p = mag ( i );
-                        mag ( i ) = 0;
-                        delete p;
-                }
         }
 }

library/tests/square_mat_stress.cpp

@@ -17 +17 @@
 using bdm::chmat;
 using bdm::ldmat;
+using bdm::shared_ptr;
 using bdm::UIFile;
 using bdm::UI;
@@ -174 +175 @@
 void test_agenda ( FTestMatrix test ) {
         UIFile fag ( agenda_file_name );
-        Array<square_mat_point *> mag;
+        Array<shared_ptr<square_mat_point> > mag;
         UI::get ( mag, fag, "agenda", UI::compulsory );
         int sz = mag.size();
         CHECK ( sz > 0 );
         for ( int i = 0; i < sz; ++i ) {
-                test ( i, mag ( i ) );
-        }
-
-        for ( int i = 0; i < sz; ++i ) {
-                square_mat_point *p = mag ( i );
-                mag ( i ) = 0;
-                delete p;
+                test ( i, mag ( i ).get() );
         }
 }

library/tests/test_kalman.cpp

@@ -82 +82 @@
 
         // EKF
-        bilinfn fxu ( A, B );
-        bilinfn hxu ( C, D );
+        shared_ptr<bilinfn> fxu = new bilinfn ( A, B );
+        shared_ptr<bilinfn> hxu = new bilinfn ( C, D );
         EKFCh KFE;
-        KFE.set_parameters ( &fxu, &hxu, Q, R );
+        KFE.set_parameters ( fxu, hxu, Q, R );
         KFE.set_est ( mu0, chmat ( P0 ) );
         const epdf& KFEep = KFE.posterior();

library/tests/user_info_test.cpp

@@ -1 @@
-#include <memory>
 #include <string>
 #include <string.h>
@@ -103 +102 @@
 public:
         int kilometers;
-        Array<Passenger*> passengers;
+        Array<shared_ptr<Passenger> > passengers;
 
         Car() : Transport() {
@@ -192 +191 @@
 TEST ( test_load ) {
         UIFile in ( "test_user_info_input.cfg" );
-        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo", UI::compulsory ) );
+        shared_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1998 by audi, having 25000 kilometers on the clock.The names of passengers are as follows: Karlos Novak -1_CygWin_Matlab_Aimsun Karlosik Novacek " ), pepikovo->to_string() );
 
-        auto_ptr<Transport> jardovo ( UI::build<Transport> ( in, "jardovo", UI::compulsory ) );
+        shared_ptr<Transport> jardovo ( UI::build<Transport> ( in, "jardovo", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1992 by liaz, having 1555000 kilometers on the clock." ), jardovo->to_string() );
 
-        auto_ptr<Transport> ondrejovo ( UI::build<Transport> ( in, "ondrejovo", UI::compulsory ) );
+        shared_ptr<Transport> ondrejovo ( UI::build<Transport> ( in, "ondrejovo", UI::compulsory ) );
         CHECK_EQUAL ( string ( "a bike made in 1996 by author with electric lights included" ), ondrejovo->to_string() );
 
-        auto_ptr<Transport> elisky ( UI::build<Transport> ( in, "elisky", UI::compulsory ) );
+        shared_ptr<Transport> elisky ( UI::build<Transport> ( in, "elisky", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1992 by liaz, having 1555000 kilometers on the clock." ), elisky->to_string() );
 
-        auto_ptr<Transport> kati ( UI::build<Transport> ( in, "kati", UI::compulsory ) );
+        shared_ptr<Transport> kati ( UI::build<Transport> ( in, "kati", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1980 by vecernicek, having 250000 kilometers on the clock." ), kati->to_string() );
 }
@@ -210 +209 @@
 TEST ( test_save ) {
         UIFile in ( "test_user_info_input.cfg" );
-        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo", UI::compulsory ) );
+        shared_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo", UI::compulsory ) );
 
         Car audi ( 1968, "zyl", 200 );
@@ -220 +219 @@
         UI::save ( &liaz, out, "bohousovo" );
         UI::save ( &author, out, "karlovo" );
-        UI::save ( pepikovo.get(), out, "pepikovo" );
+        UI::save ( pepikovo, out, "pepikovo" );
         out.save ( "testUI_out.cfg" );