Changeset 1321 for applications/pmsm/simulator_zdenek/test_Ch.cpp

Timestamp:

04/04/11 14:15:18 (13 years ago)

Author:

smidl

Message:

Carlson fast with C + test

Files:

• applications/pmsm/simulator_zdenek/test_Ch.cpp (modified) (3 diffs)

applications/pmsm/simulator_zdenek/test_Ch.cpp

@@ -27 +27 @@
                 int PSICh[25]={0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0};
                 int Chf[25]={0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0};
+                int Cf[10]={0,0,0,0,0, 0,0,0,0,0};
                 int multip=1<<15;
                 
@@ -129 +130 @@
         vec b;
         mat C = zeros(2,5);
-        C(0,0)=1.0;C(1,1)=1.0;
+        C(0,0)=.2;C(1,1)=0.4;C(0,1)=0.3;
+        
         for (int iy=0; iy<2; iy++){
                 a     = U.T()*C.get_row(iy);    // a is not modified, but 
@@ -160 +162 @@
         
         Ch = U*diag(sqrt(D));
+        mat_to_int16(round_i(C*multip),Cf);             
 
         cout << "bef Carlson: " << imat(Chf,5,5) << endl;
-        
-        carlson(difz,xf, Chf, Rf, 2, 5);
+
+        carlson_fastC(difz,xf, Chf, Cf,Rf, 2, 5);
         
         cout << endl<<"after Carlson" <<endl;