Changeset 654 for applications/pmsm/pmsm_estim.cpp

Timestamp:

10/12/09 19:38:57 (15 years ago)

Author:

smidl

Message:

PMSM compiles again

Files:

• applications/pmsm/pmsm_estim.cpp (modified) (3 diffs)

applications/pmsm/pmsm_estim.cpp

@@ -7 +7 @@
  */
 
-#include "user_info.h"
-#include "stat/loggers.h"
+#include "base/user_info.h"
+#include "base/loggers.h"
 #include "estim/kalman.h"
 #include "pmsmDS.h"
+#include "filters.h"
 
 
@@ -20 +21 @@
         UIFile F ( fname );
 
-        logger* L = UI::build <logger>( F, "logger" );
-        DS * pDS = UI::build<DS> ( F, "system" );
-        Array<BM*> Es;                  // array of estimators
+        shared_ptr<logger> L = UI::build <logger>( F, "logger" );
+        shared_ptr<DS>  pDS = UI::build<DS> ( F, "system" );
+        Array<shared_ptr<BM> > Es;                      // array of estimators
         UI::get( Es, F, "estimator" );
         int nE = Es.length();   //number of estimators
@@ -60 +61 @@
         L->finalize();
 
-        delete L;
-        delete pDS;
         for (int i=0; i<nE; i++){
                 delete Dls(i);
-                delete Es(i);
         }
         return 0;