Changeset 1153 for applications

Timestamp:

07/28/10 10:45:14 (15 years ago)

Author:

smidl

Message:

up-to date pmsm

Files:

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

applications/pmsm/pmsmDS.h

@@ -109 +109 @@
     };
 
-    void log_register ( logger &L )
-    {
-        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
+    void log_register ( logger &L , const string &prefix)
+    {
+                DS::log_register ( L, prefix );
+                
+       // log differences
         if ( log_level[logvoltage] )
         {
-            L_optu = L.add_vector ( ru, "model" );
+            L.add_vector ( log_level, logvoltage, ru, "model" );
         }
     }
@@ -124 +122 @@
     void log_write ( logger &L )
     {
-        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 ( log_level[logvoltage] )
         {
@@ -144 +138 @@
             ua = ( 2.0* ( u1-du1 )- ( u2-du2 )- ( u3-du3 ) ) /3.0;
             ub = ( ( u2-du2 )- ( u3-du3 ) ) /sq3;
-            L.log_vector ( L_optu , vec_2 ( ua,ub ) );
+            log_level.store( logvoltage , vec_2 ( ua,ub ) );
         }
 
@@ -226 +220 @@
     }
 
-    void log_add(logger &L, const string &name="" )
-    {
-        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.log_vector(L_err, interr);
-        L.log_vector(L_CRB,diag(_R()));
-        L.log_vector(L_sec,secder);
-    }
-
     void from_setting( const Setting &root )
     {
@@ -310 +291 @@
     }
 
-    void log_add(logger &L, const string &name="" )
-    {
-        L_CRB=L.add_vector(concat(rx,RV("Mz",1,0)),"crbz");
-    }
-    void logit(logger &L)
-    {
-        L.log_vector(L_CRB,diag(_R()));
-    }
 
     void from_setting( const Setting &root )