Changeset 700 for applications/bdmtoolbox/mex

Timestamp:

11/04/09 22:54:58 (15 years ago)

Author:

smidl

Message:

Making tutorial/userguide example work again (changes of mpdf and bayes)

Location:

applications/bdmtoolbox/mex

Files:

• epdf2mpdf.m (deleted)
• estimator.cpp (modified) (3 diffs)
• merger.cpp (modified) (1 diff)
• simulator.cpp (modified) (2 diffs)

applications/bdmtoolbox/mex/estimator.cpp

@@ -48 +48 @@
  */
 
-#include "estim/arx.h"
-#include "stat/emix.h"
-#include "base/datasources.h"
-#include "base/loggers.h"
-#include "estim/particles.h"
-#include "estim/kalman.h"
+#include <estim/arx.h>
+#include <stat/emix.h>
+#include <base/datasources.h>
+#include <base/loggers.h>
+#include <estim/particles.h>
+#include <estim/kalman.h>
 
 //#include "mex_datasource.h"
@@ -61 +61 @@
 #ifdef MEX
 #include <itpp/itmex.h>
-#include "mex/mex_BM.h"
-#include "mex/mex_logger.h"
-#include "mex/mex_datasource.h"
+#include <mex/mex_BM.h>
+#include <mex/mex_logger.h>
+#include <mex/mex_datasource.h>
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {
@@ -120 +120 @@
         Array<shared_ptr<BM> > Es;
         UI::get ( Es,Cfg, "estimators" );
-        long Ndat=10;
+        int Ndat=10;
         if ( Cfg.exists ( "experiment" ) ) {
-                if ( Cfg.lookupValue ( "experiment.ndat",Ndat ) ) {
+                if ( Cfg.getRoot().lookupValue ( "experiment.ndat",Ndat ) ) {
                         bdm_assert ( Ndat<=Ds->max_length(), "Data source has less data then required" );
                 };

applications/bdmtoolbox/mex/merger.cpp

@@ -58 +58 @@
 #endif
         // Sources
-        Array<shared_ptr<mpdf> >  Sources;
+        Array<shared_ptr<pdf> >  Sources;
         UI::get(Sources, Cfg, "Sources", UI::compulsory);
         shared_ptr<merger_base> Merger = UI::build<merger_base> ( Cfg, "Merger" );

applications/bdmtoolbox/mex/simulator.cpp

@@ -39 +39 @@
  */
 
-#include "estim/arx.h"
-#include "stat/emix.h"
-#include "base/datasources.h"
-#include "base/loggers.h"
+#include <estim/arx.h>
+#include <stat/emix.h>
+#include <base/datasources.h>
+#include <base/loggers.h>
 
 //#include "mex_datasource.h"
@@ -104 +104 @@
 
         shared_ptr<DS> Ds = UI::build<DS> ( Cfg, "system" );
-        long Ndat=10;
+        int Ndat=10;
         if ( Cfg.exists ( "experiment" ) ) {
                 if ( Cfg.lookupValue ( "experiment.ndat",Ndat ) ) {