Changeset 895 for applications

Show
Ignore:
Timestamp:
04/08/10 16:01:03 (14 years ago)
Author:
smidl
Message:

get rid of Yrv in DS

Location:
applications
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • applications/bdmtoolbox/tutorial/userguide/frg_estim.m

    r871 r895  
    1111A1.rv = y; 
    1212A1.rgr = RVtimes([y,u],[-3,-1]) ;  
    13 A1.log_level ='logbounds,logevidence'; 
     13A1.log_level = 'logbounds,logevidence'; 
    1414A1.frg = 0.9; 
    1515A1.name = 'A1'; 
     16 
    1617 
    1718%%%%%% Random walk on frg - Dirichlet  
     
    1920phi_pdf.rv    = RV({'phi','1_phi'});       % 2D random walk - frg is the first element 
    2021phi_pdf.k     = 0.01;              % width of the random walk 
    21 phi_pdf.betac = [0.1 0.1];       % stabilizing elememnt of random walk 
     22phi_pdf.betac = [0.1 0.1];         % stabilizing elememnt of random walk 
    2223 
     24%%%%%% Particle 
     25p.class = 'MarginalizedParticle'; 
     26p.parameter_pdf = phi_pdf;         % Random walk is the parameter evolution model 
     27p.bm    = A1; 
     28 
     29% prior on ARX 
    2330%%%%%% Combining estimators in Marginalized particle filter 
    24 E.class = 'MPF'; 
    25 E.BM = A1;                         % ARX is the analytical part 
    26 E.parameter_pdf = phi_pdf;         % Random walk is the parameter evolution model 
     31E.class = 'PF'; 
     32E.particle = p;                    % ARX is the analytical part 
    2733E.res_threshold = 1.0;             % resampling parameter 
    2834E.n = 10;                          % number of particles 
    2935E.prior.class = 'eDirich';         % prior on non-linear part 
    3036E.prior.beta  = [2 1]; %  
    31 E.log_level ='logbounds,logevidence'; 
     37E.log_level = 'logbounds,logevidence'; 
    3238E.name = 'MPF'; 
    3339 
  • applications/pmsm/pmsmDS.h

    r894 r895  
    3939    { 
    4040        Dt=125; 
    41         Yrv=RV ( "{o_ua o_ub o_ia o_ib t_ua t_ub o_om o_th Mz }" ); 
    42                 ytsize = Yrv._dsize(); 
    43                 Drv = Yrv; 
     41        Drv=RV ( "{o_ua o_ub o_ia o_ib t_ua t_ub o_om o_th Mz }" ); 
     42                dtsize = Drv._dsize(); 
    4443    } 
    4544    void set_parameters ( double Rs0, double Ls0, double Fmag0, double Bf0, double p0, double kp0, double J0, double Uc0, double DT0, double dt0 )