Changeset 1468 for applications/pmsm/simulator_zdenek/ekf_example/matrix_vs.cpp

Timestamp:

12/16/12 23:05:25 (11 years ago)

Author:

smidl

Message:

uprava generatoru

Files:

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

applications/pmsm/simulator_zdenek/ekf_example/matrix_vs.cpp

@@ -669 +669 @@
 }
 
-void carlson_fastC(int16 *difz, int16 *xp, int16 *Ch, int16 *C, int16 *R, unsigned int16 dimy, unsigned int16 dimx, int16 *detS, int16 *rem ) {
+void carlson_fastC(int16 *difz, int16 *xp, int16 *Ch, int16 *C, int16 *R, unsigned int16 dimy, unsigned int16 dimx, int32 *detS, int16 *rem ) {
         int16 alpha,beta,gamma;
         int16 delta, eta,epsilon,zeta,sigma,tau;
@@ -678 +678 @@
         int16 *Ch_ij, *w_i, *x_i, *C_yi;
         
-        *detS = 32767;
+        *detS = 1;//
+        *rem = 0;
         for (iy=0; iy<dimy; iy++)
         {
@@ -741 +742 @@
                 }
                 
-                *detS = ((int32)*detS*alpha+(1<<14))>>8;
                 *rem += ((int32)delta*delta)/alpha;
-        }
-}
-
+                *detS = ((int32)*detS*alpha); // !!! unshifterd!!, ie.e multipled by q15, all numbers are small
+                printf("%d %d %d %d\n", delta, alpha, *rem, *detS);
+        }
+        printf("\n");
+}
+