Changeset 933 for library

Timestamp:

05/11/10 16:25:24 (15 years ago)

Author:

smidl

Message:

bdmtoolbox updated for new loggers

Location:

library/bdm

Files:

• base/loggers.h (modified) (1 diff)
• mex/mex_parser.h (modified) (1 diff)

library/bdm/base/loggers.h

@@ -56 +56 @@
                 if ( id >= 0 ) {
                         vectors ( id ).set_row ( ind, v );
+                }
+        }
+        void log_double ( int id, const double &d ) {
+                bdm_assert ( id < vectors.length(), "Logger was not initialized, run init()." );
+                if ( id >= 0 ) {
+                        vectors ( id )( ind, 0 )=d;
                 }
         }

library/bdm/mex/mex_parser.h

@@ -91 +91 @@
                                 Setting &child = setting.add ( key, Setting::TypeString );
                                 child = mxArray2string ( value );
-                        }
+                                } else {
                         if ( mxIsLogical ( value ) ) {
                                 Setting &child = setting.add ( key, Setting::TypeBoolean );
                                 child = ( bool ) mxArray2bin ( value );
-                        }
+                        } else {
                         if ( mxIsStruct ( value ) ) {
                                 Setting &child = setting.add ( key, Setting::TypeGroup );
                                 fillGroup ( child, value );
-                        }
+                        } else {
                         if ( mxIsCell ( value ) ) {
                                 Setting &child = setting.add ( key, Setting::TypeList );
                                 fillList ( child, value );
-                        }
+                        } else {
                         if ( mxIsNumeric ( value ) ) {
                                 storeNumeric ( setting, value, ( string ) key );
-                        }
-                        if (mxIsObject(value)){
+                        } else {
+                        // it is neither of above - treat it as an address
+                        // if (mxIsObject(value)){ <== should be tested but it is broken in matlab...
+                        
                                 Setting &child = setting.add(key, Setting::TypeInt64);
                                 child = (long)value;
                         }
+                        }
+                        }
+                        }
+                                }
                 }
         }