Changeset 568 for applications/bdmtoolbox/mex

Timestamp:

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

Author:

smidl

Message:

bdmtoolbox adapted to shared_ptr, merger_grid (partially) working,

Location:

applications/bdmtoolbox/mex

Files:

• config2mxstruct.cpp (modified) (1 diff)
• estimator.cpp (modified) (3 diffs)
• merger.cpp (modified) (4 diffs)

applications/bdmtoolbox/mex/config2mxstruct.cpp

@@ -13 +13 @@
                 }
                 catch(exception e){
-                        cout <<e.what() <<endl;
+                        cout <<"Error: " << e.what() <<endl;
                 }
         }

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

applications/bdmtoolbox/mex/merger.cpp

@@ -59 +59 @@
 #endif
         // Sources
-        Array<mpdf*> Sources;
+        Array<shared_ptr<mpdf> > Sources;
         //abuse Mer to store sources
         Setting& _Sources = Cfg.lookup ("Sources");
@@ -66 +66 @@
         for (int i = 0; i < Slen; i++) {
                 try {
-                        mpdf* mtmp = UI::build<mpdf> (_Sources, i);
+                        shared_ptr<mpdf> mtmp = UI::build<mpdf> (_Sources, i);
                         Sources (i) = mtmp;
                 } catch (UIException) {
@@ -73 +73 @@
                                 shared_ptr<epdf> etmp = UI::build<epdf> (_Sources, i);
                                 if (etmp) {
-                                        Sources (i) = new mepdf (etmp);
+                                        Sources (i) = new mepdf (etmp); // hopefully OK
                                 }
-                        } catch (UIException e) {
+                        } catch (UIException &e) {
                                 it_error ("No mpdfs or epdfs found! " + string (e.what()));
                         } catch (std::exception e) {
                                 it_error ("Error in UI at " + _Sources[i].getPath());
                         }
-                } catch (std::exception e) {
+                } catch (std::exception &e) {
                         it_error ("Error in UI at " + _Sources[i].getPath());
                 }
         }
 
-        merger_base* Merger = UI::build<merger_base> (Cfg, "Merger");
+        shared_ptr<merger_base> Merger = UI::build<merger_base> (Cfg, "Merger");
 
         // Support
-        Setting & _Supp = Cfg.lookup ("Support");
-
-        if (_Supp.exists ("grid") &&  _Supp.exists ("nbins")) {
-                Array<vec> bounds (0);
-                UI::get (bounds, _Supp, "grid");
-                ivec nbins (0);
-                UI::get (nbins, _Supp, "nbins");
-                Merger->set_support (bounds, nbins);
-
-        } else {
-                if (_Supp.exists ("pdf") &&  _Supp.exists ("nsamples")) {
-                        epdf *g0 = UI::build<epdf> (_Supp, "pdf");
-                        int npoints = 100;
-                        _Supp.lookupValue ("nsamples", npoints);
-                        Merger->set_support (*g0, npoints);
-                        delete g0;
-                } else it_error ("Use either [grid,nbins] or [pdf,nsamples].");
+        try {
+                shared_ptr<rectangular_support> RecSup = UI::build<rectangular_support> (Cfg, "Support");
+                Merger->set_support(*RecSup);
+        }
+        catch (UIException &e) {
+                shared_ptr<epdf> g0 = UI::build<epdf> (Cfg, "Support");
+                Merger->set_support (*g0, 100);
         }
 // COMPUTE RESULTS
-        Merger->set_sources (Sources, true); // takes care of deletion of sources
+        Merger->set_sources (Sources); 
         Merger->merge();
 
@@ -128 +118 @@
         }
 
-        merger_mix* MerMix=dynamic_cast<merger_mix*>(Merger);
+        merger_mix* MerMix=dynamic_cast<merger_mix*>(Merger.get());
         vec mix_val;