Changeset 568 for applications/bdmtoolbox/mex/estimator.cpp

Timestamp:

08/20/09 00:54:44 (15 years ago)

Author:

smidl

Message:

bdmtoolbox adapted to shared_ptr, merger_grid (partially) working,

Files:

• applications/bdmtoolbox/mex/estimator.cpp (modified) (3 diffs)

applications/bdmtoolbox/mex/estimator.cpp

@@ -109 +109 @@
 #endif
         
-        logger* L = UI::build<logger>( Cfg, "logger");
-        ArxDS * DS = UI::build<ArxDS>( Cfg, "system" );
-        Array<BM*> Es;  UI::get(Es,Cfg, "estimators" );
+        shared_ptr<logger> L = UI::build<logger>( Cfg, "logger");
+        shared_ptr<ArxDS> DS = UI::build<ArxDS>( Cfg, "system" );
+        Array<shared_ptr<BM> > Es;      UI::get(Es,Cfg, "estimators" );
         int Ndat;
         Cfg.lookupValue ( "experiment.ndat",Ndat );
@@ -151 +151 @@
 
 #ifdef MEX
-        mexlog* mL=dynamic_cast<mexlog*>(L);
+        mexlog* mL=dynamic_cast<mexlog*>(L.get());
 
         if (mL) { // user wants output!!
@@ -158 +158 @@
         }
 #endif
-        ///////
-        delete L;
-        delete DS;
-        for (int i;i<Es.length();i++){delete Es(i);delete Dls(i);}
 }