Changeset 786 for applications

Show
Ignore:
Timestamp:
01/13/10 22:56:35 (15 years ago)
Author:
smidl
Message:

acc

Location:
applications
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • applications/bdmtoolbox/tutorial/mpdm/dist_ctrl_acc.m

    r785 r786  
    7171    M= arena(DS,{P1,P2},exper); 
    7272 
    73     Y = [M.DS_y1; M.DS_y2; M.DS_y3]; 
    74     Yreq = [0;1;0]*ones(1,size(M.DS_y1,2)); 
    75     loss_non_coop(i) = (Y-Yreq)'*C1.Qy*(Y-Yreq) + M.DS_u1'*C1.Qu*M.DS_u1 + M.DS_u2'*C1.Qu*M.DS_u2; 
     73    Y = [M.DS_y1 M.DS_y2 M.DS_y3]; 
     74    Yreq = ones(size(M.DS_y1))*[0 1 0]; 
     75    loss_non_coop(i) = trace((Y-Yreq)'*0.01*(Y-Yreq)) + M.DS_u1'*C1.Qu*M.DS_u1 + M.DS_u2'*C1.Qu*M.DS_u2; 
    7676    if loss_non_coop(i)>100 
    7777        %keyboard 
    … …  
    8686    M= arena(DS,{P1,P2},exper); 
    8787 
    88     Y = [M.DS_y1; M.DS_y2; M.DS_y3]; 
    89     Yreq = [0;1;0]*ones(1,size(M.DS_y1,2)); 
    90     loss_non_coop(i) = (Y-Yreq)'*C1.Qy*(Y-Yreq) + M.DS_u1'*C1.Qu*M.DS_u1 + M.DS_u2'*C1.Qu*M.DS_u2; 
     88    Y = [M.DS_y1 M.DS_y2 M.DS_y3]; 
     89    Yreq = ones(size(M.DS_y1))*[0 1 0]; 
     90    loss_non_coop(i) = trace((Y-Yreq)'*0.01*(Y-Yreq)) + M.DS_u1'*C1.Qu*M.DS_u1 + M.DS_u2'*C1.Qu*M.DS_u2; 
    9191    if loss_coop(i)>100 
    9292        %keyboard 

  • applications/dual/experiment/lq_test.m

    r754 r786  
    11b = 1; 
    2 P0 = 1; 
     2P0 = 5; 
    33ytm = 0; 
    44yr = 1;