Changeset 262

Show
Ignore:
Timestamp:
02/09/09 23:10:36 (16 years ago)
Author:
smidl
Message:

cleanup of include files

Files:
54 modified

Legend:

Unmodified
Added
Removed
  • bdm/estim/arx.h

    r254 r262  
    1414#define AR_H 
    1515 
    16 #include <itpp/itbase.h> 
    1716#include "../stat/libFN.h" 
    1817#include "../stat/libEF.h" 
     
    7271                if(evalll){last_lognc=est.lognc();} 
    7372        } 
    74         //! Conditional version of the predictor 
     73        //! Conditioned version of the predictor 
    7574        enorm<ldmat>* predictor(const RV &rv0, const vec &rgr) const;  
    7675        enorm<ldmat>* predictor(const RV &rv0) const {it_assert_debug(rv0.count()==V.rows()-1,"Regressor is not only 1");return predictor(rv0,vec_1(1.0));} 
     76        //! conditional version of the predictor 
    7777        mlnorm<ldmat>* predictor(const RV &rv0, const RV &rvc0) const; 
    7878        mlstudent* predictor_student(const RV &rv0, const RV &rvc0) const; 
  • bdm/estim/libKF.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include "libKF.h" 
    33 
  • bdm/estim/libKF.h

    r254 r262  
    1414#define KF_H 
    1515 
    16 #include <itpp/itbase.h> 
     16 
    1717#include "../stat/libFN.h" 
    1818#include "../stat/libEF.h" 
  • bdm/estim/libPF.h

    r254 r262  
    1414#define PF_H 
    1515 
    16 #include <itpp/itbase.h> 
     16 
    1717#include "../stat/libEF.h" 
    18 #include "../math/libDC.h" 
    1918 
    2019namespace bdm{ 
  • bdm/estim/merger.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include "merger.h" 
    33#include "arx.h" 
  • bdm/estim/merger.h

    r254 r262  
    1414#define MER_H 
    1515 
    16 #include <itpp/itbase.h> 
     16 
    1717#include "mixef.h" 
    1818 
  • bdm/estim/mixef.h

    r254 r262  
    1414#define MEF_H 
    1515 
    16 #include <itpp/itbase.h> 
     16 
    1717#include "../stat/libFN.h" 
    1818#include "../stat/libEF.h" 
  • bdm/math/chmat.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include "chmat.h" 
    33 
  • bdm/math/chmat.h

    r254 r262  
    1414#define CHMAT_H 
    1515 
    16 #include <itpp/itbase.h> 
     16 
    1717#include "libDC.h" 
    18 #include "../itpp_ext.h" 
    1918 
    2019/*! \brief Symmetric matrix stored in square root decomposition using upper cholesky 
  • bdm/math/libDC.cpp

    r170 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include "libDC.h" 
    33 
  • bdm/math/libDC.h

    r219 r262  
    1414#define DC_H 
    1515 
    16 #include <itpp/itbase.h> 
     16 
    1717#include "../itpp_ext.h" 
    1818 
  • bdm/osutils.h

    r93 r262  
    1111// 
    1212 
    13 #include <itpp/itbase.h> 
     13#include "itpp_ext.h" 
     14 
    1415using namespace std; 
    1516 
  • bdm/stat/libBM.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include "libBM.h" 
    33#include "../itpp_ext.h" 
    44 
     5//! Space of basic BDM structures 
    56namespace bdm { 
    67 
  • bdm/stat/libEF.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <itpp/base/bessel.h> 
    33#include "libEF.h" 
     
    8787 
    8888} 
     89 
     90vec egiw::variance() const { 
     91 
     92        if ( xdim==1 ) { 
     93                int l=V.rows(); 
     94                const ldmat tmp(V,linspace(1,l-1)); 
     95                ldmat itmp(l); 
     96                tmp.inv(itmp); 
     97                double cove = V._D() ( 0 ) / ( nu -nPsi -2*xdim -2 ); 
     98                 
     99                vec var(l); 
     100                var.set_subvector(0,diag(itmp.to_mat())*cove); 
     101                var(l-1)=cove*cove/( nu -nPsi -2*xdim -2 ); 
     102                return var; 
     103        } 
     104        else {it_error("not implemneted"); return vec(0);} 
     105} 
     106 
    89107void egiw::mean_mat ( mat &M, mat&R ) const { 
    90108        const mat &L= V._L(); 
  • bdm/stat/libEF.h

    r256 r262  
    1414#define EF_H 
    1515 
    16 #include <itpp/itbase.h> 
    17 #include "../math/libDC.h" 
     16 
    1817#include "libBM.h" 
    19 #include "../itpp_ext.h" 
     18#include "../math/chmat.h" 
    2019//#include <std> 
    2120 
     
    193192        vec sample() const; 
    194193        vec mean() const; 
    195         vec variance() const{it_error("Not implemented"); return vec(0);}; 
     194        vec variance() const; 
    196195        void mean_mat ( mat &M, mat&R ) const; 
    197196        //! In this instance, val= [theta, r]. For multivariate instances, it is stored columnwise val = [theta_1 theta_2 ... r_1 r_2 ] 
     
    466465 
    467466/*! (Approximate) Student t density with linear function of mean value 
     467 
     468The internal epdf of this class is of the type of a Gaussian (enorm).  
     469However, each conditioning is trying to assure the best possible approximation by taking into account the zeta function. See [] for reference. 
     470 
     471Perhaps a moment-matching technique?  
    468472*/ 
    469473class mlstudent : public mlnorm<ldmat> { 
  • bdm/stat/libFN.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include "libFN.h" 
    33 
  • bdm/stat/libFN.h

    r254 r262  
    1313#define FN_H 
    1414 
    15 #include <itpp/itbase.h> 
    1615#include "libBM.h" 
    1716 
  • bdm/stat/loggers.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include "loggers.h" 
    33#include "../osutils.h" 
  • bdm/uibuilder.cpp

    r260 r262  
    33namespace bdm{ 
    44         
     5        //! global map of UIbulder names to instances of UIbuilders. Created by UIREGISTER macro 
    56UImap __uimap__; 
    67 
  • doprava/k1.cpp

    r254 r262  
    1111*/ 
    1212 
    13 #include <itpp/itbase.h> 
     13 
    1414#include <stat/libFN.h> 
    1515#include <estim/ekf_templ.h> 
  • mpdm/merger_iter_cond.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <stat/libEF.h> 
    33#include <estim/merger.h> 
  • pmsm/mpf_load.cpp

    r254 r262  
    1212*/ 
    1313 
    14 #include <itpp/itbase.h> 
     14 
    1515#include <stat/libFN.h> 
    1616#include <estim/libKF.h> 
  • pmsm/mpf_test.cpp

    r254 r262  
    1212 
    1313 
    14 #include <itpp/itbase.h> 
     14 
    1515#include <estim/libKF.h> 
    1616#include <estim/libPF.h> 
  • pmsm/mpf_u_delta.cpp

    r254 r262  
    1414 
    1515 
    16 #include <itpp/itbase.h> 
     16 
    1717#include <estim/libKF.h> 
    1818#include <estim/libPF.h> 
  • pmsm/mpf_u_delta_real.cpp

    r254 r262  
    1414 
    1515 
    16 #include <itpp/itbase.h> 
     16 
    1717#include <estim/libKF.h> 
    1818#include <estim/libPF.h> 
  • pmsm/mpf_u_weight.cpp

    r254 r262  
    1414 
    1515 
    16 #include <itpp/itbase.h> 
     16 
    1717#include <estim/libKF.h> 
    1818#include <estim/libPF.h> 
  • pmsm/pmsm_mix.cpp

    r254 r262  
    1111*/ 
    1212 
    13 #include <itpp/itbase.h> 
     13 
    1414#include <stat/libFN.h> 
    1515#include <stat/emix.h> 
  • pmsm/pmsm_sim.cpp

    r254 r262  
    1111*/ 
    1212 
    13 #include <itpp/itbase.h> 
     13 
    1414#include <estim/libKF.h> 
    1515#include <estim/libPF.h> 
  • pmsm/pmsm_sim2.cpp

    r254 r262  
    1111*/ 
    1212 
    13 #include <itpp/itbase.h> 
     13 
    1414#include <estim/libKF.h> 
    1515#include <estim/libPF.h> 
  • pmsm/pmsm_unkQ.cpp

    r254 r262  
    1111*/ 
    1212 
    13 #include <itpp/itbase.h> 
     13 
    1414#include <estim/libKF.h> 
    1515#include <estim/libPF.h> 
  • pmsm/pmsm_unkQpf.cpp

    r254 r262  
    1111*/ 
    1212 
    13 #include <itpp/itbase.h> 
     13 
    1414#include <estim/libKF.h> 
    1515#include <estim/libPF.h> 
  • pmsm/sim_var.cpp

    r254 r262  
    1212*/ 
    1313 
    14 #include <itpp/itbase.h> 
     14 
    1515#include <stat/libFN.h> 
    1616#include <estim/libKF.h> 
  • pmsm/sim_var_arx.cpp

    r254 r262  
    1212*/ 
    1313 
    14 #include <itpp/itbase.h> 
     14 
    1515#include <estim/arx.h> 
    1616 
  • pmsm/simulator_zdenek/ekf_example/ekf_obj.cpp

    r80 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <estim/libKF.h> 
    33 
  • pmsm/simulator_zdenek/ekf_example/ekf_obj.h

    r254 r262  
    1414#define EKFfix_H 
    1515 
    16 #include <itpp/itbase.h> 
     16 
    1717#include <estim/libKF.h> 
    1818#include "fixed.h" 
  • pmsm/testbidiff.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include "../bdm/stat/libBM.h" 
    33 
  • tests/blas_test.cpp

    r211 r262  
     1 
    12#include <itpp/itbase.h> 
    2  
    33using namespace itpp; 
    44 
  • tests/chmat_test.cpp

    r82 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <math/chmat.h> 
    33 
  • tests/datalink_test.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include "../bdm/stat/libBM.h" 
    33#include "../bdm/math/libDC.h" 
  • tests/fsqmat_test.cpp

    r87 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <math/libDC.h> 
    33 
  • tests/ldmat_test.cpp

    r82 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <math/libDC.h> 
    33 
  • tests/loggers_test.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <stat/loggers.h> 
    33 
  • tests/merger_2d_test.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <stat/libEF.h> 
    33#include <estim/merger.h> 
  • tests/merger_iter_test.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <stat/libEF.h> 
    33#include <estim/merger.h> 
  • tests/merger_test.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <stat/libEF.h> 
    33#include <estim/merger.h> 
  • tests/rv_test.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include "../bdm/stat/libBM.h" 
    33#include "../bdm/math/libDC.h" 
  • tests/test0.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include "../bdm/stat/libBM.h" 
    33#include "../bdm/math/libDC.h" 
  • tests/testEpdf.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <stat/libEF.h> 
    33 
  • tests/testKF.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <estim/libKF.h> 
    33 
  • tests/testKF_QR.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <estim/libKF.h> 
    33#include <estim/libPF.h> 
  • tests/testKF_QRexh.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <estim/libKF.h> 
    33#include <estim/libPF.h> 
  • tests/testPF.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <estim/libPF.h> 
    33#include <math/libDC.h> 
  • tests/testResample.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <estim/libPF.h> 
    33#include <math/libDC.h> 
  • tests/testSmp.cpp

    r254 r262  
    1 #include <itpp/itbase.h> 
     1 
    22#include <stat/libEF.h> 
    33#include <stat/emix.h>