Changeset 108

Show
Ignore:
Timestamp:
05/12/08 17:56:55 (16 years ago)
Author:
smidl
Message:

Fixes for compilation on Win32 platform

Files:
6 modified

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    r95 r108  
    3535 
    3636ELSE(WIN32) 
     37        ADD_DEFINITIONS(-DNODEFAULTLIB:library) 
    3738        FIND_PACKAGE(ITPP REQUIRED) 
    3839 

  • bdm/math/chmat.cpp

    r76 r108  
    1717        Ch = R ( 0, Ch.rows()-1, 0, Ch.cols()-1 ); 
    1818}; 
    19 inline mat chmat::to_mat() {mat F=Ch.T() *Ch;return F;}; 
     19mat chmat::to_mat() {mat F=Ch.T() *Ch;return F;}; 
    2020void chmat::mult_sym ( const mat &C ) { 
    2121        it_error ( "not implemented" ); 
    … …  
    3737}; 
    3838//TODO can be done more efficiently using BLAS, see triangular matrices 
    39 inline vec chmat::sqrt_mult ( const vec &v ) const {vec pom; pom = Ch*v; return pom;}; 
    40 inline double chmat::qform ( const vec &v ) const {vec pom; pom = Ch*v; return pom*pom;}; 
    41 inline double chmat::invqform ( const vec &v ) const { 
     39vec chmat::sqrt_mult ( const vec &v ) const {vec pom; pom = Ch*v; return pom;}; 
     40double chmat::qform ( const vec &v ) const {vec pom; pom = Ch*v; return pom*pom;}; 
     41double chmat::invqform ( const vec &v ) const { 
    4242        vec pom(v.length()); 
    4343        forward_substitution(Ch.T(),v,pom); 
    4444        return pom*pom; 
    4545}; 
    46 inline void chmat::clear() {Ch.clear();}; 
     46void chmat::clear() {Ch.clear();}; 

  • bdm/math/chmat.h

    r101 r108  
    3232 
    3333        void opupdt ( const vec &v, double w ); 
    34         inline mat to_mat(); 
     34        mat to_mat(); 
    3535        void mult_sym ( const mat &C ); 
    3636        void mult_sym ( const mat &C , chmat &U ) const; 
    … …  
    3838        void mult_sym_t ( const mat &C, chmat &U ) const; 
    3939        double logdet() const; 
    40         inline vec sqrt_mult ( const vec &v ) const; 
    41         inline double qform ( const vec &v ) const; 
    42         inline double invqform ( const vec &v ) const; 
    43         inline void clear(); 
     40        vec sqrt_mult ( const vec &v ) const; 
     41        double qform ( const vec &v ) const; 
     42        double invqform ( const vec &v ) const; 
     43        void clear(); 
    4444        //! add another chmat \c A2 with weight \c w. 
    4545        void add ( const chmat &A2, double w=1.0 ) {}; 

  • pmsm/sim_var.cpp

    r105 r108  
    1414#include <stat/libFN.h> 
    1515#include <estim/libKF.h> 
    16 #include <estim/libPF.h> 
     16//#include <estim/libPF.h> 
     17#include <math/chmat.h> 
    1718 
    1819#include "pmsm.h" 

  • pmsm/simulator_zdenek/simulator.cpp

    r59 r108  
    1717#include "regulace.h" 
    1818#include "simulator.h" 
     19 
    1920 
    2021#define REZIM_REGULACE  1       // 0...reg. momentu, 1...reg.rychlosti, 2... Isqw=sqrt(Imax^2-Id^2) - max. moment 

  • pmsm/simulator_zdenek/simulator.h

    r59 r108  
    1111*/ 
    1212 
     13// resi problem s M_PI ve VC8 
     14#ifndef M_PI 
     15#define M_PI        3.14159265358979323846 
     16#endif 
     17 
    1318 
    1419extern void pmsmsim_set_parameters(double Rs0, double Ls0, double Fmag0, double Bf0, double p0, double kp0, double J0, double Uc0, double DT0, double dt0);