Changeset 588

Timestamp:

08/28/09 09:06:54 (15 years ago)

Author:

smidl

Message:

win32 compilation fixes

Location:

library

Files:

• bdm/base/bdmbase.h (modified) (1 diff)
• bdm/mex/mex_parser.h (modified) (1 diff)
• tests/LQG_test.cpp (modified) (1 diff)

library/bdm/base/bdmbase.h

@@ -691 +691 @@
 
                 //! log this vector
-                virtual void logit (int id, const vec &v) = 0;
+                virtual void logit (int id, const vec &v) {bdm_error("Not implemented");};
                 //! log this double
-                virtual void logit (int id, const double &d) = 0;
+                virtual void logit (int id, const double &d) {bdm_error("Not implemented");};
 
                 //! Shifts storage position for another time step.
-                virtual void step() = 0;
+                virtual void step() {bdm_error("Not implemneted");};
 
                 //! Finalize storing information

library/bdm/mex/mex_parser.h

@@ -103 +103 @@
                         mexErrMsgTxt ( "Given mxArray is not a cell." );
                 };
-                for ( uint i = 0; i < mxGetNumberOfElements ( mxarray ); i++ ) {
+                for ( unsigned int i = 0; i < mxGetNumberOfElements ( mxarray ); i++ ) {
                         mxArray *value = mxGetCell ( mxarray, i );
                         if ( mxIsChar ( value ) ) {

library/tests/LQG_test.cpp

@@ -14 +14 @@
 
         reg.redesign();
-        CHECK_CLOSE(reg.apply("0.5, 1.1","0.0")(0) /*convert vec to double*/, -0.248528137234392, 0.0001);
+        double reg_apply=reg.apply("0.5, 1.1","0.0")(0); /*convert vec to double*/
+        CHECK_CLOSE(reg_apply, -0.248528137234392, 0.0001);
 }