Changeset 1243 for library

Show
Ignore:
Timestamp:
11/02/10 21:20:06 (14 years ago)
Author:
smidl
Message:

Contrallable PMSM DS + PI control

Location:
library/bdm/design
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • library/bdm/design/arx_ctrl.h

    r1064 r1243  
    6060        lq.redesign(); 
    6161    } 
    62     vec ctrlaction ( const vec &cond ) const { 
     62    vec ctrlaction ( const vec &cond ) { 
    6363        //cond is xt + ut 
    6464        vec state = cond.left ( Stsp->_A().rows() ); 

  • library/bdm/design/ctrlbase.h

    r1130 r1243  
    1010  ----------------------------------- 
    1111*/ 
     12 
     13#ifndef CTRL_BASE 
     14#define CTRL_BASE 
     15 
    1216 
    1317#include "../base/bdmbase.h" 
    … …  
    3236    virtual void redesign() {}; 
    3337    //! returns designed control action 
    34     virtual vec ctrlaction ( const vec &cond ) const { 
     38    virtual vec ctrlaction ( const vec &cond ) { 
    3539        return vec ( 0 ); 
    3640    } 
    … …  
    129133 
    130134    //! compute control action 
    131     vec ctrlaction ( const vec &state, const vec &ukm ) const { 
     135    vec ctrlaction ( const vec &state, const vec &ukm ) { 
    132136        vec pom = concat ( state, ones ( dimy ), ukm ); 
    133137        return L*pom; 
    … …  
    141145 
    142146} // namespace 
     147 
     148#endif //CTRL_BASE