Changeset 384 for applications/pmsm

Timestamp:

06/19/09 10:17:25 (16 years ago)

Author:

mido

Message:

possibly broken?

Location:

applications/pmsm

Files:

• TR2245/pmsm_wishart.cpp (modified) (1 diff)
• TR2245/unitsteps.cpp (modified) (1 diff)
• TR2245/wishart.cpp (modified) (1 diff)
• mpf_load.cpp (modified) (1 diff)
• pmsm.h (modified) (1 diff)
• pmsmDS.h (modified) (1 diff)
• pmsm_estim.cpp (modified) (1 diff)
• pmsm_estim_mex.cpp (modified) (2 diffs)
• simulator_zdenek/ekf_example/ekf_obj.cpp (modified) (1 diff)
• simulator_zdenek/ekf_example/ekf_obj.h (modified) (1 diff)

applications/pmsm/TR2245/pmsm_wishart.cpp

@@ -13 +13 @@
 
 
-#include <estim/libPF.h>
-#include <estim/ekf_templ.h>
-#include <stat/libFN.h>
+#include <estim/particles.h>
+#include <estim/ekf_template.h>
+#include <stat/functions.h>
 
 #include "user_info.h"

applications/pmsm/TR2245/unitsteps.cpp

@@ -13 +13 @@
 
 
-#include <estim/libPF.h>
-#include <estim/ekf_templ.h>
-#include <stat/libFN.h>
+#include <estim/particles.h>
+#include <estim/ekf_template.h>
+#include <stat/functions.h>
 
 

applications/pmsm/TR2245/wishart.cpp

@@ -13 +13 @@
 
 
-#include <estim/libPF.h>
-#include <estim/ekf_templ.h>
-#include <stat/libFN.h>
+#include <estim/particles.h>
+#include <estim/ekf_template.h>
+#include <stat/functions.h>
 
 #include "../pmsm.h"

applications/pmsm/mpf_load.cpp

@@ -13 +13 @@
 
 
-#include <stat/libFN.h>
-#include <estim/libKF.h>
-#include <estim/libPF.h>
-#include <estim/ekf_templ.h>
+#include <stat/functions.h>
+#include <estim/kalman.h>
+#include <estim/particles.h>
+#include <estim/ekf_template.h>
 #include <math/chmat.h>
 

applications/pmsm/pmsm.h

@@ -2 +2 @@
 #define PMSM_H
 
-#include <stat/libFN.h>
+#include <stat/functions.h>
 #include "user_info.h"
 

applications/pmsm/pmsmDS.h

@@ -12 +12 @@
 
 #include <stat/loggers.h>
-#include <estim/libKF.h>
+#include <estim/kalman.h>
 #include "simulator_zdenek/simulator.h"
 #include "pmsm.h"

applications/pmsm/pmsm_estim.cpp

@@ -9 +9 @@
 #include "user_info.h"
 #include "stat/loggers.h"
-#include "estim/libKF.h"
+#include "estim/kalman.h"
 #include "pmsmDS.h"
 

applications/pmsm/pmsm_estim_mex.cpp

@@ -7 +7 @@
  */
 
-#include "pmsm_ui.h"
-#include <stat/loggers_ui.h>
-#include <estim/KF_ui.h>
+#include "pmsm.h"
+#include "stat/loggers.h"
+#include "estim/kalman.h"
 
 #include <itpp/itmex.h>
-#include "../../library/mex/mexlog.h"
-#include "../../library/mex/mexds.h"
-#include "../../library/mex/mexparse.h"
+#include "../../library/mex/mex_logger.h"
+#include "../../library/mex/mex_datasource.h"
+#include "../../library/mex/mex_parser.h"
 
 using namespace bdm;
@@ -83 +83 @@
         // ------------------ End of routine -----------------------------
         
-        mexlog* mL=dynamic_cast<mexlog*>(L);
+        mex_logger* mL=dynamic_cast<mex_logger*>(L);
 
         if (mL) { // user wants output!!

applications/pmsm/simulator_zdenek/ekf_example/ekf_obj.cpp

@@ -1 +1 @@
 
-#include <estim/libKF.h>
+#include <estim/kalman.h>
 
 #include "ekf_obj.h"

applications/pmsm/simulator_zdenek/ekf_example/ekf_obj.h

@@ -15 +15 @@
 
 
-#include <estim/libKF.h>
+#include <estim/kalman.h>
 #include "fixed.h"
 #include "matrix.h"