Changeset 373

Timestamp:

06/11/09 16:38:30 (15 years ago)

Author:

smidl

Message:

adaptation of mexes to new UI (compiles - does not work!!)

Location:

library/mex

Files:

• estimator.cpp (modified) (2 diffs)
• mexds.h (modified) (1 diff)
• mexlog.h (modified) (3 diffs)

library/mex/estimator.cpp

@@ -1 +1 @@
 #include <itpp/itmex.h>
 
-#include <stat/libDS_ui.h>
-#include <estim/arx_ui.h>
+#include "estim/arx.h"
+#include "stat/libDS.h"
+#include "stat/loggers.h"
+#include "mexlog.h"
 
-#include "mexlog.h"
-#include "mexds.h"
+//#include "mexds.h"
 
 using namespace bdm;
@@ -20 +21 @@
         
         printf("name: %s", fname.c_str());
-        UIFile F ( fname.c_str());
+        UI_File F ( fname.c_str());
 
-        logger* L;
-        DS * 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/mex/mexds.h

@@ -1 @@
-#include "../bdm/stat/libDS_ui.h"
+//#include "../bdm/stat/libDS_ui.h"
 
 /*! \brief Create memory data source from mxArray

library/mex/mexlog.h

@@ -1 @@
-#include "../bdm/stat/loggers_ui.h"
+#include "stat/loggers.h"
 
+namespace bdm{
 int mxReplaceFieldNM(mxArray *X,const char * fname,mxArray *X1)
 {
@@ -19 +20 @@
 };
 
-class mexlog : public memlog{
+class mexlog : public memlog {
         public:
         //! constructor
-        mexlog(int maxlen): memlog(maxlen,"mx"){};
+        mexlog(): memlog(0,"mx"){};
         //!
         mxArray* toCell(){
@@ -48 +49 @@
                 return tmp;
         }
+        void from_setting (const Setting &root){
+          maxlen=root["maxlen"];
+        }
 };
-
-class UImexlog: public UIbuilder{
-        public:
-                UImexlog():UIbuilder("mexlog"){};
-                bdmroot* build(Setting &S) const{
-                        return new mexlog(S["maxlen"]);
-                };
-};
-UIREGISTER(UImexlog);
+UIREGISTER(mexlog);
+}