Changeset 1314 for applications

Timestamp:

03/25/11 19:52:28 (13 years ago)

Author:

smidl

Message:

test UD pro int/long variantu

Files:

• applications/pmsm/simulator_zdenek/test_UD.cpp (modified) (7 diffs)

applications/pmsm/simulator_zdenek/test_UD.cpp

@@ -19 +19 @@
         vec R = vec(" 0.2000 0.3000");
         
-                vec D = randu(5)*0.9;
+                vec D = randu(5)*0.4;
                 vec xref = ones(5);
 
@@ -46 +46 @@
         
         mat PhiU =A*U;
-/*      cout << "A*U" << round_i(PhiU*multip) <<endl;
-        cout << "PSIU: "; for (i=0; i<25;i++) cout << PSIU[i] << ","; cout <<endl;*/
+        cout << "A*U" << round_i(PhiU*multip) <<endl;
+        cout << "PSIU: "; for (i=0; i<25;i++) cout << PSIU[i] << ","; cout <<endl;
         
         Mat<int16> PUcmp(PSIU,5,5);
-//      cout << "Delta PSI: " << round_i(PhiU*multip-(1<<(15-qAU))*PUcmp) <<endl;
+        imat PUcmpi=PUcmp;
+        cout << "Delta PSI: " << round_i(PhiU*multip-(1<<(15-qAU))*PUcmp) <<endl;
         
         mat_to_int16(round_i(PhiU*multip/(1<<(15-qAU))),PSIU); //<< make is same
@@ -91 +92 @@
         
         cout << endl<<"after thorton " <<endl;
-//      cout << "U: " << round_i(U*multip) << endl;
-//      cout << "D: " << round_i(D*multip) << endl;
-//      cout << "Uf: "; for (i=0; i<25;i++) {cout << Uf[i] << ","; ((i+1)%5==0)? cout << endl:cout<<""; }
-//      cout << "Df: "; for (i=0; i<5;i++) cout << Df[i] << ","; cout << endl;
+        cout << "U: " << round_i(U*multip) << endl;
+        cout << "D: " << round_i(D*multip) << endl;
+        cout << "Uf: "; for (i=0; i<25;i++) {cout << Uf[i] << ","; ((i+1)%5==0)? cout << endl:cout<<""; }
+        cout << "Df: "; for (i=0; i<5;i++) cout << Df[i] << ","; cout << endl;
 
         Mat<int16> Ucmp(Uf,5,5);
@@ -119 +120 @@
         
         int16 xf_old[5];
-        vec_to_int16(ivec(xf,5),xf_old);
+        for (i=0;i<5;i++) xf_old[i]=xf[i];
         
         /////// Test bierman
@@ -126 +127 @@
         vec b;
         mat C = zeros(2,5);
-        C(0,0)=1.0;C(1,1)=1.0;
+        C(0,0)=.05;C(0,1)=-.01;
+        C(1,0)=0.; C(1,1) = .07;
+        
+        int16 Cf[10];
+        imat iC=round_i(C*multip);
+        mat_to_int16(iC, Cf);
+        
+        
         for (int16 iy=0; iy<2; iy++){
                 a     = U.T()*C.get_row(iy);    // a is not modified, but 
@@ -156 +164 @@
         }
         
-        bierman_fast(difz,xf, Uf, Df, Rf, 2, 5);
+        bierman_fastC(difz,xf, Uf, Df, Cf, Rf, 2, 5);
         cout << endl<<"after Bierman" <<endl;
 /*      cout << "U: " << round_i(U*multip) << endl;
@@ -166 +174 @@
 
         {
-        imat Ucmp(Uf,5,5);
-        ivec Dcmp(Df,5);
+        Mat<int16> Ucmp(Uf,5,5);
+        Vec<int16> Dcmp(Df,5);
         cout << "Delta U: " << round_i(U*multip-Ucmp) << endl;
         cout << "Delat D: " << round_i(D*multip-Dcmp) << endl;