Changeset 357 for applications/pmsm/pmsm_estim.cpp

Timestamp:

06/08/09 02:15:30 (15 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

Files:

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

applications/pmsm/pmsm_estim.cpp

@@ -7 +7 @@
  */
 
-#include "pmsm_ui.h"
-#include "stat/loggers_ui.h"
-#include "estim/KF_ui.h"
-#include "stat/libDS_ui.h"
+#include "user_info.h"
+#include "stat/loggers.h"
 
 using namespace bdm;
@@ -17 +15 @@
         if ( argc>1 ) {fname = argv[1]; }
         else { cout << "Missing configuration file.\n Usage: \n $> estimator config_file.cfg"<<endl; abort(); }
-        UIFile F ( fname );
+        UI_File F ( fname );
 
-        logger* L;
-        DS * DS;
+        logger* L = UI::build <logger>( F, "logger" );
+        DS * pDS = UI::build<DS> ( F, "system" );
         Array<BM*> Es;                  // array of estimators
+        UI::get( Es, F, "estimator" );
+        int nE = Es.length();   //number of estimators
         int Ndat;                               //number of data records
-        int nE;                                 //number of estimators
-
-        try {
-                UIbuild ( F.lookup ( "logger" ),L );
-                UIbuild ( F.lookup ( "system" ),DS );
-                F.lookupValue ( "experiment.ndat",Ndat );
-                Setting& S=F.lookup ( "estimator" );
-                nE = S.getLength();
-                Es.set_size(nE);
-                for(int i=0;i<nE;i++){          
-                        UIbuild (S[i] ,Es(i) );
-                }
-        }
-        catch UICATCH;
-
-        DS->log_add ( *L );
+        F.lookupValue ( "experiment.ndat",Ndat );
+                
+        pDS->log_add ( *L );
         string nic="";
         for (int i=0; i<nE; i++){
@@ -45 +32 @@
         L->init();
 
-        vec dt=zeros ( DS->_drv()._dsize() );   //data variable
+        vec dt=zeros ( pDS->_drv()._dsize() );   //data variable
         Array<datalink*> Dls(nE); 
         for (int i=0; i<nE; i++){
-                Dls(i)=new datalink( Es(i)->_drv(),DS->_drv() ); //datalink between a datasource and estimator
+                Dls(i)=new datalink( Es(i)->_drv(),pDS->_drv() ); //datalink between a datasource and estimator
         }
         
@@ -54 +41 @@
         for ( int tK=1;tK<Ndat;tK++ ) {
                 // Data Source
-                DS->step();                                                     // simulator step
-                DS->getdata ( dt );                                     // read data
-                DS->logit ( *L );
+                pDS->step();                                                    // simulator step
+                pDS->getdata ( dt );                                    // read data
+                pDS->logit ( *L );
                 
                 // Estimators
@@ -71 +58 @@
 
         delete L;
-        delete DS;
+        delete pDS;
         for (int i=0; i<nE; i++){
                 delete Dls(i);