Changeset 384 for applications

Show
Ignore:
Timestamp:
06/19/09 10:17:25 (15 years ago)
Author:
mido
Message:

possibly broken?

Location:
applications
Files:
1 added
19 modified
2 copied
3 moved

Legend:

Unmodified
Added
Removed

  • applications/CMakeLists.txt

    r319 r384  
    55add_subdirectory (mpdm) 
    66add_subdirectory (doprava) 
     7add_subdirectory (bdmtoolbox) 

  • applications/bdmtoolbox/estimator.cpp

    r357 r384  
    4444>> Res=estimator('config_file.cfg'); 
    4545\endcode 
    46 when using logger of the type \c "mexlog". The results will be stored in structure \c M. 
     46when using logger of the type \c "mex_logger". The results will be stored in structure \c M. 
    4747 
    4848 */ 
    4949 
    50 #include "stat/libDS.h" 
     50#include "stat/datasources.h" 
    5151#include "estim/arx.h" 
    5252#include "user_info.h" 

  • applications/bdmtoolbox/mex/estimator.cpp

    r373 r384  
    22 
    33#include "estim/arx.h" 
    4 #include "stat/libDS.h" 
     4#include "stat/datasources.h" 
    55#include "stat/loggers.h" 
    6 #include "mexlog.h" 
     6#include "mex_logger.h" 
    77 
    8 //#include "mexds.h" 
     8//#include "mex_datasource.h" 
    99 
    1010using namespace bdm; 
    … …  
    5454        // ------------------ End of routine ----------------------------- 
    5555         
    56         mexlog* mL=dynamic_cast<mexlog*>(L); 
     56        mex_logger* mL=dynamic_cast<mex_logger*>(L); 
    5757 
    5858        if (mL) { // user wants output!! 

  • applications/bdmtoolbox/mex/mxstruct2config.cpp

    r331 r384  
    1 #include "mexparse.h" 
     1#include "mex_parser.h" 
    22 
    33void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) { 

  • applications/doprava/k1.cpp

    r357 r384  
    1212 
    1313 
    14 #include <estim/ekf_templ.h> 
     14#include <estim/ekf_template.h> 
    1515 
    1616//include dopravni model 
    1717#include "model.h" 
    18 #include "stat\libDS.h" 
     18#include "stat\datasources.h" 
    1919#include "stat\loggers.h" 
    2020 

  • applications/doprava/model.h

    r283 r384  
    22#define MODEL_H 
    33 
    4 #include <stat/libFN.h> 
     4#include <stat/functions.h> 
    55 
    66using namespace bdm; 

  • applications/mpdm/SYSID09/merg_2a.cpp

    r379 r384  
    11#include <estim/arx.h> 
    22#include <estim/merger.h> 
    3 #include <stat/libEF.h> 
     3#include <stat/exp_family.h> 
    44#include <stat/loggers.h> 
    55//#include <stat/merger.h> 

  • applications/mpdm/TR2244/merger_iter_cond.cpp

    r379 r384  
    11 
    2 #include <stat/libEF.h> 
     2#include <stat/exp_family.h> 
    33#include <estim/merger.h> 
    44 

  • applications/mpdm/merg_giw.cpp

    r288 r384  
    11#include <estim/arx.h> 
    22#include <estim/merger.h> 
    3 #include <stat/libEF.h> 
     3#include <stat/exp_family.h> 
    44#include <stat/loggers.h> 
    55//#include <stat/merger.h> 

  • applications/mpdm/merg_pred.cpp

    r278 r384  
    11#include <estim/arx.h> 
    22#include <estim/merger.h> 
    3 #include <stat/libEF.h> 
     3#include <stat/exp_family.h> 
    44#include <stat/loggers.h> 
    55//#include <stat/merger.h> 

  • applications/pmsm/TR2245/pmsm_wishart.cpp

    r357 r384  
    1313 
    1414 
    15 #include <estim/libPF.h> 
    16 #include <estim/ekf_templ.h> 
    17 #include <stat/libFN.h> 
     15#include <estim/particles.h> 
     16#include <estim/ekf_template.h> 
     17#include <stat/functions.h> 
    1818 
    1919#include "user_info.h" 

  • applications/pmsm/TR2245/unitsteps.cpp

    r357 r384  
    1313 
    1414 
    15 #include <estim/libPF.h> 
    16 #include <estim/ekf_templ.h> 
    17 #include <stat/libFN.h> 
     15#include <estim/particles.h> 
     16#include <estim/ekf_template.h> 
     17#include <stat/functions.h> 
    1818 
    1919 

  • applications/pmsm/TR2245/wishart.cpp

    r357 r384  
    1313 
    1414 
    15 #include <estim/libPF.h> 
    16 #include <estim/ekf_templ.h> 
    17 #include <stat/libFN.h> 
     15#include <estim/particles.h> 
     16#include <estim/ekf_template.h> 
     17#include <stat/functions.h> 
    1818 
    1919#include "../pmsm.h" 

  • applications/pmsm/mpf_load.cpp

    r279 r384  
    1313 
    1414 
    15 #include <stat/libFN.h> 
    16 #include <estim/libKF.h> 
    17 #include <estim/libPF.h> 
    18 #include <estim/ekf_templ.h> 
     15#include <stat/functions.h> 
     16#include <estim/kalman.h> 
     17#include <estim/particles.h> 
     18#include <estim/ekf_template.h> 
    1919#include <math/chmat.h> 
    2020 

  • applications/pmsm/pmsm.h

    r377 r384  
    22#define PMSM_H 
    33 
    4 #include <stat/libFN.h> 
     4#include <stat/functions.h> 
    55#include "user_info.h" 
    66 

  • applications/pmsm/pmsmDS.h

    r377 r384  
    1212 
    1313#include <stat/loggers.h> 
    14 #include <estim/libKF.h> 
     14#include <estim/kalman.h> 
    1515#include "simulator_zdenek/simulator.h" 
    1616#include "pmsm.h" 

  • applications/pmsm/pmsm_estim.cpp

    r366 r384  
    99#include "user_info.h" 
    1010#include "stat/loggers.h" 
    11 #include "estim/libKF.h" 
     11#include "estim/kalman.h" 
    1212#include "pmsmDS.h" 
    1313 

  • applications/pmsm/pmsm_estim_mex.cpp

    r349 r384  
    77 */ 
    88 
    9 #include "pmsm_ui.h" 
    10 #include <stat/loggers_ui.h> 
    11 #include <estim/KF_ui.h> 
     9#include "pmsm.h" 
     10#include "stat/loggers.h" 
     11#include "estim/kalman.h" 
    1212 
    1313#include <itpp/itmex.h> 
    14 #include "../../library/mex/mexlog.h" 
    15 #include "../../library/mex/mexds.h" 
    16 #include "../../library/mex/mexparse.h" 
     14#include "../../library/mex/mex_logger.h" 
     15#include "../../library/mex/mex_datasource.h" 
     16#include "../../library/mex/mex_parser.h" 
    1717 
    1818using namespace bdm; 
    … …  
    8383        // ------------------ End of routine ----------------------------- 
    8484         
    85         mexlog* mL=dynamic_cast<mexlog*>(L); 
     85        mex_logger* mL=dynamic_cast<mex_logger*>(L); 
    8686 
    8787        if (mL) { // user wants output!! 

  • applications/pmsm/simulator_zdenek/ekf_example/ekf_obj.cpp

    r262 r384  
    11 
    2 #include <estim/libKF.h> 
     2#include <estim/kalman.h> 
    33 
    44#include "ekf_obj.h" 

  • applications/pmsm/simulator_zdenek/ekf_example/ekf_obj.h

    r283 r384  
    1515 
    1616 
    17 #include <estim/libKF.h> 
     17#include <estim/kalman.h> 
    1818#include "fixed.h" 
    1919#include "matrix.h"