Show
Ignore:
Timestamp:
11/28/09 14:38:48 (15 years ago)
Author:
smidl
Message:

Working unitsteps and controlloop + corresponding fixes

Location:
applications/bdmtoolbox/tutorial
Files:
1 added
2 modified

Legend:

Unmodified
Added
Removed
  • applications/bdmtoolbox/tutorial/merging/merge_frag.m

    r706 r744  
    1616Merger.ncoms=20; 
    1717Merger.stop_niter=50; 
    18 Merger.effss_coef=1; 
     18Merger.effss_coef=0.9; 
    1919%Merger.dbg_file='merger_mix_dbg'; 
    2020 
     
    3232    'R',1); 
    3333% 2D support 
    34 support2.grid={[-5,5],[0.001,9]}; 
    35 support2.nbins=[30,30]; 
     34support2.class='rectangular_support'; 
     35support2.ranges={[-5,5],[0.001,9]}; 
     36support2.gridsizes=[30,30]; 
    3637 
    3738% 2D 
  • applications/bdmtoolbox/tutorial/userguide/arx_ctrl_example.m

    r724 r744  
    11% name random variables 
    22y = RV({'y'},1); 
    3 u = RV({'u'},1); 
     3u1 = RV({'u1'},1); 
     4u2 = RV({'u2'},1); 
    45 
    56% create f(y_t| y_{t-3}, u_{t-1}) 
    67fy.class = 'mlnorm<ldmat>'; 
    78fy.rv    = y; 
    8 fy.rvc   = RVtimes([y,u], [-3, -1]); 
    9 fy.A     = [0.5, -0.9]; 
     9fy.rvc   = RVtimes([y,u1,u2], [-3, 0, 0]); 
     10fy.A     = [0.5, -0.9, 0.9]; 
    1011fy.const = 0; 
    1112fy.R     = 1e-2; 
     
    1718A1.class = 'ARX'; 
    1819A1.rv = y; 
    19 A1.rgr = RVtimes([y,u],[-3,-1]) ; % correct structure is {y,y} 
     20A1.rgr = RVtimes([y,u1,u2],[-3,0,0]) ; % correct structure is {y,y} 
    2021A1.options ='logbounds,logll'; 
    2122 
    2223C1.class = 'LQG_ARX'; 
    2324C1.ARX = A1; 
    24 C1.Qu = 0.1*eye(1); 
     25C1.Qu = 0.1*eye(2); 
    2526C1.Qy = eye(1); 
    2627C1.yreq = 1; 
    2728C1.horizon = 100; 
    2829 
     30% participant 1 
     31Cp1. 
     32 
    2933M= controlloop(DS,{C1});