Changeset 357 for applications/pmsm/TR2245

Timestamp:

06/08/09 02:15:30 (16 years ago)

Author:

mido

Message:

mnoho zmen:
1) presun FindXXX modulu do \system
2) zalozeni dokumentace \doc\local\library_structure.dox
3) presun obsahu \tests\UI primo do \tests
4) namisto \INSTALL zalozen \install.html, je to vhodnejsi pro uzivatele WINDOWS, a snad i obecne
5) snaha o predelani veskerych UI podle nove koncepce, soubory pmsm_ui.h, arx_ui.h, KF_ui.h, libDS_ui.h, libEF_ui.h a loggers_ui.h ponechavam
jen zdokumentacnich duvodu, nic by na nich jiz nemelo zaviset, a po zkontrolovani spravnosti provedenych uprav by mely byt smazany
6) predelani estimatoru tak, aby fungoval s novym UI konceptem
7) vytazeni tridy bdmroot do samostatneho souboru \bdm\bdmroot.h
8) pridana dokumentace pro zacleneni programu ASTYLE do Visual studia, ASTYLE pridan do instalacniho balicku pro Windows

Location:

applications/pmsm/TR2245

Files:

• pmsm_wishart.cpp (modified) (3 diffs)
• unitsteps.cpp (modified) (4 diffs)
• wishart.cpp (modified) (4 diffs)

applications/pmsm/TR2245/pmsm_wishart.cpp

@@ -17 +17 @@
 #include <stat/libFN.h>
 
-#include <stat/loggers_ui.h>
-#include <stat/libEF_ui.h>
-
-#include "../pmsm_ui.h"
+#include "user_info.h"
+#include "../pmsmDS.h"
 
 using namespace bdm;
@@ -28 +26 @@
         if ( argc>1 ) {fname = argv[1]; }
         else { fname = "pmsm_wishart.cfg"; }
-        UIFile F ( fname );
+        UI_File F ( fname );
+
+        double h = 1e-6;
+        int Nsimstep = 125;
+
+        // Kalman filter
+        double k;
+        double l;
+        F.lookupValue ( "k",k);
+        F.lookupValue ( "l",l);
 
         int Ndat;
         int Npart;
-        double h = 1e-6;
-        int Nsimstep = 125;
+        F.lookupValue ( "ndat", Ndat );
+        F.lookupValue ( "Npart", Npart );
 
         vec Qdiag;
         vec Rdiag;
+        UI::get( Qdiag, F, "dQ" ); //( "1e-6 1e-6 0.001 0.0001" ); //zdenek: 0.01 0.01 0.0001 0.0001
+        UI::get( Rdiag, F, "dR" );// ( "1e-8 1e-8" ); //var(diff(xth)) = "0.034 0.034"
+                
+        pmsmDS* DS = UI::build<pmsmDS>(F,"system");
+        //      mpdf* evolQ = UI::build<mpdf>( F, "Qrw" );
 
-        pmsmDS* DS;
-
-        double k;
-        double l;
-//      mpdf* evolQ ;
-        try {
-                // Kalman filter
-                F.lookupValue ( "ndat", Ndat );
-                F.lookupValue ( "Npart",Npart );
-                
-                F.lookupValue ( "k", k);
-                F.lookupValue ( "l",l);
-
-//              UIbuild ( F.lookup ( "Qrw" ),evolQ );
-                Qdiag= getvec ( F.lookup ( "dQ" ) ); //( "1e-6 1e-6 0.001 0.0001" ); //zdenek: 0.01 0.01 0.0001 0.0001
-                Rdiag=getvec ( F.lookup ( "dR" ) );// ( "1e-8 1e-8" ); //var(diff(xth)) = "0.034 0.034"
-                
-                UIbuild(F.lookup("system"),DS);
-        }
-        catch UICATCH;
-// internal model
-
-IMpmsm fxu;
-//                  Rs    Ls        dt       Fmag(Ypm)    kp   p    J     Bf(Mz)
-fxu.set_parameters ( 0.28, 0.003465, Nsimstep*h, 0.1989, 1.5 ,4.0, 0.04, 0.0 );
+        // internal model
+        IMpmsm fxu;
+        //                  Rs    Ls        dt       Fmag(Ypm)    kp   p    J     Bf(Mz)
+        fxu.set_parameters ( 0.28, 0.003465, Nsimstep*h, 0.1989, 1.5 ,4.0, 0.04, 0.0 );
         // observation model
         OMpmsm hxu;
@@ -91 +82 @@
         M.set_rv ( concat ( rQ,rx ) );
 
-        dirfilelog *L; UIbuild ( F.lookup ( "logger" ), L );// ( "exp/mpf_test",100 );
+        dirfilelog *L = UI::build<dirfilelog> ( F, "logger" );// ( "exp/mpf_test",100 );
         
         KFE.set_options ( "logbounds" );

applications/pmsm/TR2245/unitsteps.cpp

@@ -17 +17 @@
 #include <stat/libFN.h>
 
-#include <stat/loggers_ui.h>
-#include <stat/libEF_ui.h>
 
 #include "../pmsm.h"
 #include "simulator.h"
 #include "../sim_profiles.h"
+#include "user_info.h"
+#include "stat/loggers.h"
 
 using namespace bdm;
@@ -30 +30 @@
         if ( argc>1 ) {fname = argv[1]; }
         else { fname = "unitsteps.cfg"; }
-        UIFile F ( fname );
+        UI_File F ( fname );
 
-        int Ndat;
-        int Npart;
         double h = 1e-6;
         int Nsimstep = 125;
 
+
+        // Kalman filter
+        int Ndat;
+        int Npart;
+        F.lookupValue ( "ndat", Ndat );
+        F.lookupValue ( "Npart",Npart );
+        mpdf* evolQ = UI::build<mpdf>( F, "Qrw" );
         vec Qdiag;
         vec Rdiag;
+        UI::get( Qdiag, F, "dQ" ); //( "1e-6 1e-6 0.001 0.0001" ); //zdenek: 0.01 0.01 0.0001 0.0001
+        UI::get( Rdiag, F, "dR" );// ( "1e-8 1e-8" ); //var(diff(xth)) = "0.034 0.034"
 
-        mpdf* evolQ ;
-        try {
-                // Kalman filter
-                F.lookupValue ( "ndat", Ndat );
-                F.lookupValue ( "Npart",Npart );
-
-                UIbuild ( F.lookup ( "Qrw" ),evolQ );
-                Qdiag= getvec ( F.lookup ( "dQ" ) ); //( "1e-6 1e-6 0.001 0.0001" ); //zdenek: 0.01 0.01 0.0001 0.0001
-                Rdiag=getvec ( F.lookup ( "dR" ) );// ( "1e-8 1e-8" ); //var(diff(xth)) = "0.034 0.034"
-        }
-        catch UICATCH;
-// internal model
+        // internal model
 
 IMpmsm fxu;
@@ -81 +77 @@
         M.set_rv ( concat ( rQ,rx ) );
 
-        dirfilelog *L; UIbuild ( F.lookup ( "logger" ), L );// ( "exp/mpf_test",100 );
+        dirfilelog *L = UI::build<dirfilelog>( F, "logger" );// ( "exp/mpf_test",100 );
         int l_X = L->add ( rx, "xt" );
         int l_D = L->add ( concat ( ry,ru ), "" );
@@ -99 +95 @@
         vec xtm=zeros ( 4 );
         double Ww=0.0;
-        vec vecW=getvec ( F.lookup ( "profile" ) );
+        vec vecW;
+        UI::get( vecW, F, "profile" );
 
         for ( int tK=1;tK<Ndat;tK++ ) {

applications/pmsm/TR2245/wishart.cpp

@@ -17 +17 @@
 #include <stat/libFN.h>
 
-#include <stat/loggers_ui.h>
-#include <stat/libEF_ui.h>
-
 #include "../pmsm.h"
 #include "simulator.h"
 #include "../sim_profiles.h"
+#include "user_info.h"
+#include "stat/loggers.h"
 
 using namespace bdm;
@@ -30 +29 @@
         if ( argc>1 ) {fname = argv[1]; }
         else { fname = "unitsteps.cfg"; }
-        UIFile F ( fname );
+        UI_File F ( fname );
 
+        double h = 1e-6;
         int Ndat;
         int Npart;
-        double h = 1e-6;
+        F.lookupValue ( "ndat", Ndat );
+        F.lookupValue ( "Npart",Npart );
         int Nsimstep = 125;
 
+                // Kalman filter
         vec Qdiag;
+        UI::get( Qdiag, F, "dQ" ); //( "1e-6 1e-6 0.001 0.0001" ); //zdenek: 0.01 0.01 0.0001 0.0001
+                
         vec Rdiag;
+        UI::get( Rdiag, F, "dR" );// ( "1e-8 1e-8" ); //var(diff(xth)) = "0.034 0.034"
 
-//      mpdf* evolQ ;
-        try {
-                // Kalman filter
-                F.lookupValue ( "ndat", Ndat );
-                F.lookupValue ( "Npart",Npart );
-
-//              UIbuild ( F.lookup ( "Qrw" ),evolQ );
-                Qdiag= getvec ( F.lookup ( "dQ" ) ); //( "1e-6 1e-6 0.001 0.0001" ); //zdenek: 0.01 0.01 0.0001 0.0001
-                Rdiag=getvec ( F.lookup ( "dR" ) );// ( "1e-8 1e-8" ); //var(diff(xth)) = "0.034 0.034"
-        }
-        catch UICATCH;
-// internal model
-
-IMpmsm fxu;
-//                  Rs    Ls        dt       Fmag(Ypm)    kp   p    J     Bf(Mz)
-fxu.set_parameters ( 0.28, 0.003465, Nsimstep*h, 0.1989, 1.5 ,4.0, 0.04, 0.0 );
+        // internal model
+        IMpmsm fxu;
+        //                  Rs    Ls        dt       Fmag(Ypm)    kp   p    J     Bf(Mz)
+        fxu.set_parameters ( 0.28, 0.003465, Nsimstep*h, 0.1989, 1.5 ,4.0, 0.04, 0.0 );
         // observation model
         OMpmsm hxu;
@@ -84 +77 @@
         M.set_rv ( concat ( rQ,rx ) );
 
-        dirfilelog *L; UIbuild ( F.lookup ( "logger" ), L );// ( "exp/mpf_test",100 );
+        dirfilelog *L = UI::build<dirfilelog> ( F, "logger" );// ( "exp/mpf_test",100 );
         int l_X = L->add ( rx, "xt" );
         int l_D = L->add ( concat ( ry,ru ), "" );
@@ -103 +96 @@
         vec xtm=zeros ( 4 );
         double Ww=0.0;
-        vec vecW=getvec ( F.lookup ( "profile" ) );
+        vec vecW;
+        UI::get( vecW, F ,"profile" );
         
         mat tQ=diag(Qdiag);