Changeset 728 for library/bdm/base/user_info.cpp

Timestamp:

11/17/09 00:54:28 (15 years ago)

Author:

smidl

Message:

logger now has ability to store settings - used in estimator. New mexfunction epdf_mean

Files:

• library/bdm/base/user_info.cpp (modified) (2 diffs)

library/bdm/base/user_info.cpp

@@ -198 +198 @@
                        : element.add ( name, Setting::TypeList );
 
+                                   Setting &tag= set.add ( Setting::TypeString );
+                                   tag ="matrix";
+                                   
         Setting &cols = set.add ( Setting::TypeInt );
         cols = matrix.cols();
@@ -260 +263 @@
                 Setting &elements = link.result[2 + data_offset];
 
-                assert_type ( cols_setting, Setting::TypeInt );
-                assert_type ( rows_setting, Setting::TypeInt );
-                assert_type ( elements, Setting::TypeArray );
+                // vvv ----- not working in matlab!!
+                //assert_type ( cols_setting, Setting::TypeInt );
+                //assert_type ( rows_setting, Setting::TypeInt );
+                //assert_type ( elements, Setting::TypeArray );
 
                 int cols = cols_setting;
                 int rows = rows_setting;
+                int elems = elements.getLength();
 
                 if ( cols < 0 || rows < 0 )
                         throw UISettingException ( "UIException: the dimensions of a matrix has to be non-negative.", link.result );
 
-                if ( elements.getLength() != cols * rows )
+                if ( elems != cols * rows )
                         throw UISettingException ( "UIException: the count of the matrix elements is incompatible with matrix dimension.", elements );