Changeset 786 for applications/bdmtoolbox

Timestamp:

01/13/10 22:56:35 (14 years ago)

Author:

smidl

Message:

acc

Files:

• applications/bdmtoolbox/tutorial/mpdm/dist_ctrl_acc.m (modified) (2 diffs)

applications/bdmtoolbox/tutorial/mpdm/dist_ctrl_acc.m

@@ -71 +71 @@
     M= arena(DS,{P1,P2},exper);
 
-    Y = [M.DS_y1; M.DS_y2; M.DS_y3];
-    Yreq = [0;1;0]*ones(1,size(M.DS_y1,2));
-    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;
+    Y = [M.DS_y1 M.DS_y2 M.DS_y3];
+    Yreq = ones(size(M.DS_y1))*[0 1 0];
+    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;
     if loss_non_coop(i)>100
         %keyboard
@@ -86 +86 @@
     M= arena(DS,{P1,P2},exper);
 
-    Y = [M.DS_y1; M.DS_y2; M.DS_y3];
-    Yreq = [0;1;0]*ones(1,size(M.DS_y1,2));
-    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;
+    Y = [M.DS_y1 M.DS_y2 M.DS_y3];
+    Yreq = ones(size(M.DS_y1))*[0 1 0];
+    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;
     if loss_coop(i)>100
         %keyboard