Changeset 294 for pmsm

Show
Ignore:
Timestamp:
03/12/09 22:18:43 (15 years ago)
Author:
smidl
Message:

tr2245

Location:
pmsm/TR2245
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • pmsm/TR2245/CMakeLists.txt

    r281 r294  
    11# Make sure the compiler can find include files from our Bdm library. 
    22EXEC (unitsteps pmsmsim) 
     3EXEC (wishart pmsmsim) 
     4EXEC (pmsm_wishart pmsmsim) 
  • pmsm/TR2245/unitsteps.cfg

    r285 r294  
    11ndat = 9000; 
    2 Npart = 200; 
     2Npart = 1000; 
    33 
    44//simulator  
     
    1313}; 
    1414// For EKF 
    15 dQ=[1e-6, 1e-6, 0.001, 0.0001]; 
    16 dR=[1e-6, 1e-6]; 
     15dQ=[1e-5, 1e-5, 1e-4, 1e-5]; 
     16dR=[1e-8, 1e-8]; 
    1717 
  • pmsm/TR2245/unitsteps.cpp

    r285 r294  
    6868 
    6969        RV rQ ( "{Q }","4" ); 
    70         EKFCh_unQ KFEp ; 
     70        EKFCh_dQ KFEp ; 
    7171        KFEp.set_parameters ( &fxu,&hxu,Q,R ); 
    7272        KFEp.set_est ( mu0, chmat ( zeros ( 4 ) ) ); 
    7373 
    74         MPF<EKFCh_unQ> M; 
     74        MPF<EKFCh_dQ> M; 
    7575        M.set_parameters ( evolQ,evolQ,Npart ); 
    7676        // initialize