Changeset 527 for library/bdm/base/datasources.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/base/datasources.h (modified) (4 diffs)

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 ) {