Show
Ignore:
Timestamp:
10/29/10 19:10:03 (14 years ago)
Author:
smidl
Message:

prechod na int16

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • applications/pmsm/simulator_zdenek/ekf_example/matrix_vs.h

    r1230 r1240  
    1212 
    1313#define qAU 14 
     14#define qD 14 
     15 
     16#define int16 short int 
     17#define int32 int 
    1418 
    1519/* Matrix multiply Full matrix by upper diagonal matrix with unit diagonal; */ 
    16 extern void mmultAU(int *m1, int *up, int *result, unsigned int rows, unsigned int columns); 
     20extern void mmultAU(int16 *m1, int16 *up, int16 *result, unsigned int16 rows, unsigned int16 columns); 
    1721 
    1822/* Matrix multiply Full matrix by upper diagonal matrix; */ 
    19 extern void mmultACh(int *m1, int *up, int *result, unsigned int rows, unsigned int columns); 
     23extern void mmultACh(int16 *m1, int16 *up, int16 *result, unsigned int16 rows, unsigned int16 columns); 
    2024 
    2125/* perform Thorton update of UD matrix using PSI*U, Q, and temporaries G, Dold, for size dimx*/ 
    22 extern void thorton(int *U, int *D, int *PSIU, int *Q, int *G, int *Dold, unsigned int dimx); 
     26extern void thorton(int16 *U, int16 *D, int16 *PSIU, int16 *Q, int16 *G, int16 *Dold, unsigned int16 dimx); 
    2327 
    2428/* perform Bierman update of UD matrix using difz, R and xp, for size dimx*/ 
    25 extern void bierman(int *difz, int *xp, int *U, int *D, int *R, unsigned int dimy, unsigned int dimx ); 
     29extern void bierman(int16 *difz, int16 *xp, int16 *U, int16 *D, int16 *R, unsigned int16 dimy, unsigned int16 dimx ); 
    2630 
    2731/* perform Thorton update of UD matrix using PSI*U, Q, and temporaries G, Dold, for size dimx*/ 
    28 extern void thorton_fast(int *U, int *D, int *PSIU, int *Q, int *G, int *Dold, unsigned int dimx); 
     32extern void thorton_fast(int16 *U, int16 *D, int16 *PSIU, int16 *Q, int16 *G, int16 *Dold, unsigned int16 dimx); 
    2933 
    3034/* perform Bierman update of UD matrix using difz, R and xp, for size dimx*/ 
    31 extern void bierman_fast(int *difz, int *xp, int *U, int *D, int *R, unsigned int dimy, unsigned int dimx ); 
     35extern void bierman_fast(int16 *difz, int16 *xp, int16 *U, int16 *D, int16 *R, unsigned int16 dimy, unsigned int16 dimx ); 
    3236 
    3337/* perform Householder update of Ch matrix using PSI*Ch , Q, */ 
    34 extern void householder(int *Ch /*= int *PSICh*/, int *Q, unsigned int dimx); 
     38extern void householder(int16 *Ch /*= int16 *PSICh*/, int16 *Q, unsigned int16 dimx); 
    3539 
    3640/* perform Givens update of Ch matrix using PSI*Ch , Q, */ 
    37 extern void givens(int *Ch /*= int *PSICh*/, int *Q, unsigned int dimx); 
     41extern void givens(int16 *Ch /*= int16 *PSICh*/, int16 *Q, unsigned int16 dimx); 
    3842 
    3943/* perform Carlson update of Ch matrix using difz, R and xp, for size dimx*/ 
    40 extern void carlson(int *difz, int *xp, int *Ch, int *R, unsigned int dimy, unsigned int dimx ); 
     44extern void carlson(int16 *difz, int16 *xp, int16 *Ch, int16 *R, unsigned int16 dimy, unsigned int16 dimx );