Changeset 357 for library

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

Location:

library

Files:

• estimator.cpp (modified) (2 diffs)
• tutorial/arx_mex_test.cfg (modified) (1 diff)
• tutorial/arx_test.cfg (modified) (3 diffs)

library/estimator.cpp

@@ -48 +48 @@
  */
 
-#include <stat/libDS_ui.h>
-#include <estim/arx_ui.h>
+#include "stat/libDS.h"
+#include "estim/arx.h"
+#include "user_info.h"
+#include "stat/loggers.h"
 
 using namespace bdm;
@@ -59 +61 @@
         else {
                 cout << "Missing configuration file.\n Usage: \n $> estimator config_file.cfg";
-                abort();
+                //abort();
         }
-        UIFile F ( fname );
+        fname = "arx_test.cfg";
+        UI_File F ( fname );
 
-        logger* L;
-        ArxDS * DS;
-        BM* E;
-        int Ndat;
-
-        try {
-                UIbuild ( F.lookup ( "logger" ),L );
-                UIbuild ( F.lookup ( "system" ),DS );
-                F.lookupValue ( "experiment.ndat",Ndat );
-                UIbuild ( F.lookup ( "estimator" ),E );
-        }
-        catch UICATCH;
+        logger* L = UI::build<logger>( F, "logger");
+        ArxDS * DS = UI::build<ArxDS>( F, "system" );
+        BM* E = UI::build<BM>( F, "estimator" );
+        int Ndat = F.lookupValue ( "experiment.ndat",Ndat );
 
         DS->log_add ( *L );

library/tutorial/arx_mex_test.cfg

@@ -11 +11 @@
 //estimation
 estimator = {
-   type = "ARXest";
-        y = {type="rv"; names=["y"]; };
-        rgr = {type="rv";
-                names = ["y","y","y","u"];
+   type = "ARX";
+        y = {type="RV"; names=("y"); };
+        rgr = {type="RV";
+                names = ("y","y","y","u");
                 times = [-1, -2, -3, -1];
         };

library/tutorial/arx_test.cfg

@@ -1 +1 @@
 //Data generating system
 system = {
-        type = "ArxDS";
-        y = {type="rv"; names=["y", "u"];};
-        u = {type="rv"; names=[]; };
-        rgr = {type="rv";
-                names = ["y","y","y","u"];
+        class = "ArxDS";
+        y = {class="RV"; names=("y", "u");};
+        u = {class="RV"; names=(); };
+        rgr = {class="RV";
+                names = ("y","y","y","u");
                 times = [-1, -2, -3, -1];
         };
         //AR parameters
-        theta = [0.8, -0.3, 0.4, 1.0,
-                 0.0, 0.0, 0.0, 0.0];
+        theta = (2,4,[0.8, -0.3, 0.4, 1.0,
+                      0.0, 0.0, 0.0, 0.0]);
         // offset
         offset = [0.0, 0.0];
         //variance
-        r = [0.1, 0.0,
-             0.0, 1.0];
+        r = (2,2,[0.1, 0.0,
+                 0.0, 1.0] );
         // log also theta
         opt="L_theta";
@@ -22 +22 @@
 //store results
 logger = {
-        type= "dirfilelog";
+        class= "dirfilelog";
         dirname = "exp/arx_ui";
         maxlen = 1000; //
@@ -29 +29 @@
 //estimation
 estimator = {
-        type = "ARXest";
-        y = {type="rv"; names=["y"]; };
-        rgr = {type="rv";
-                names = ["y","y","y","u"];
+        class = "ARX";
+        y = {class="RV"; names=("y"); };
+        rgr = {class="RV";
+                names = ("y","y","y","u");
                 times = [-1, -2, -3, -1];
         };