Changeset 786

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

acc

Files:
5 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; 

  • library/system/FindITPP.cmake

    r509 r786  
    5656ELSE (ITPP_FOUND) 
    5757   IF (ITPP_FIND_REQUIRED) 
     58      MESSAGE("LIB: ${ITPP_LIBRARY}") 
     59      MESSAGE("LIB DEB: ${ITPP_LIBRARY_DEBUG}") 
     60      MESSAGE("INC: ${ITPP_INCLUDE_DIR}") 
    5861      MESSAGE(FATAL_ERROR "Could not find ITPP library, make sure ITPP_DIR is properly set") 
    5962   ENDIF (ITPP_FIND_REQUIRED) 

  • library/system/SetBdmEnv.cmake

    r693 r786  
    3939        # Generally this directory should not exist! 
    4040        # Use this location is you compile itpp from sources 
    41         IF(NOT ITPP_DIR) 
     41        MESSAGE("ITPPDIR $ENV{ITPP_DIR}") 
     42        IF($ENV{ITPP_DIR}) 
     43                SET(ITPP_DIR $ENV{ITPP_DIR}) 
     44        ELSE($ENV{ITPP_DIR}) 
    4245                SET(ITPP_DIR "${BDM_SOURCE_DIR}/system/linux/") 
    43         ENDIF(NOT ITPP_DIR) 
     46        ENDIF($ENV{ITPP_DIR}) 
     47        MESSAGE("ITPPDIR ${ITPP_DIR}") 
    4448        #This is for UNIX makefile which does only one release at a time. 
    4549ENDIF(UNIX) 

  • library/system/linux/configure_itpp

    r618 r786  
    11#./configure --enable-debug --enable-exceptions --enable-static --disable-comm --disable-fixed --disable-optim --disable-protocol --disable-signal --disable-srccode --without-fft --with-lapack=/usr/lib/liblapack_pic.a 
    2 ./configure --enable-debug --enable-static --disable-comm --disable-fixed --disable-optim --disable-protocol --disable-signal --disable-srccode --without-fft --with-lapack=/usr/lib/liblapack_pic.a 
     2./configure --enable-debug --enable-static --disable-comm --disable-fixed --disable-optim --disable-protocol --disable-signal --disable-srccode --without-fft --with-lapack=/usr/lib64/liblapack_pic.a