Changeset 744 for applications/pmsm/pmsmDS.h

Timestamp:

11/28/09 14:38:48 (14 years ago)

Author:

smidl

Message:

Working unitsteps and controlloop + corresponding fixes

Files:

• applications/pmsm/pmsmDS.h (modified) (5 diffs)

applications/pmsm/pmsmDS.h

@@ -118 +118 @@
     void log_register ( logger &L )
     {
-        L_x = L.add ( rx, "x" );
-        L_oy = L.add ( ry, "o" );
-        L_ou = L.add ( ru, "o" );
-        L_iu = L.add ( ru, "t" );
+        L_x = L.add_vector ( rx, "x" );
+        L_oy = L.add_vector ( ry, "o" );
+        L_ou = L.add_vector ( ru, "o" );
+        L_iu = L.add_vector ( ru, "t" );
         // log differences
         if ( opt_modu )
         {
-            L_optu = L.add ( ru, "model" );
+            L_optu = L.add_vector ( ru, "model" );
         }
     }
@@ -131 +131 @@
     void log_write ( logger &L )
     {
-        L.logit ( L_x, vec ( x,4 )      );
-        L.logit ( L_oy, vec_2 ( KalmanObs[2],KalmanObs[3] ) );
-        L.logit ( L_ou, vec_2 ( KalmanObs[0],KalmanObs[1] ) );
-        L.logit ( L_iu, vec_2 ( KalmanObs[4],KalmanObs[5] ) );
+        L.log_vector ( L_x, vec ( x,4 ) );
+        L.log_vector ( L_oy, vec_2 ( KalmanObs[2],KalmanObs[3] ) );
+        L.log_vector ( L_ou, vec_2 ( KalmanObs[0],KalmanObs[1] ) );
+        L.log_vector ( L_iu, vec_2 ( KalmanObs[4],KalmanObs[5] ) );
         if ( opt_modu )
         {
@@ -151 +151 @@
             ua = ( 2.0* ( u1-du1 )- ( u2-du2 )- ( u3-du3 ) ) /3.0;
             ub = ( ( u2-du2 )- ( u3-du3 ) ) /sq3;
-            L.logit ( L_optu , vec_2 ( ua,ub ) );
+            L.log_vector ( L_optu , vec_2 ( ua,ub ) );
         }
 
@@ -238 +238 @@
     void log_add(logger &L, const string &name="" )
     {
-        L_CRB=L.add(rx,"crb");
-        L_err=L.add(rx,"err");
-        L_sec=L.add(rx,"d2");
+        L_CRB=L.add_vector(rx,"crb");
+        L_err=L.add_vector(rx,"err");
+        L_sec=L.add_vector(rx,"d2");
     }
     void logit(logger &L)
     {
-        L.logit(L_err, interr);
-        L.logit(L_CRB,diag(_R()));
-        L.logit(L_sec,secder);
+        L.log_vector(L_err, interr);
+        L.log_vector(L_CRB,diag(_R()));
+        L.log_vector(L_sec,secder);
     }
 
@@ -322 +322 @@
     void log_add(logger &L, const string &name="" )
     {
-        L_CRB=L.add(concat(rx,RV("Mz",1,0)),"crbz");
+        L_CRB=L.add_vector(concat(rx,RV("Mz",1,0)),"crbz");
     }
     void logit(logger &L)
     {
-        L.logit(L_CRB,diag(_R()));
+        L.log_vector(L_CRB,diag(_R()));
     }