Changeset 620 for library/bdm/base

Timestamp:

09/16/09 14:47:36 (15 years ago)

Author:

smidl

Message:

replace assert_debug by assert in classes interacting with users (from_setting, set_parameters, validate)

Location:

library/bdm/base

Files:

• bdmbase.cpp (modified) (1 diff)
• bdmbase.h (modified) (3 diffs)
• loggers.h (modified) (1 diff)
• user_info.h (modified) (2 diffs)

library/bdm/base/bdmbase.cpp

@@ -76 +76 @@
 void RV::init ( const Array<std::string> &in_names, const ivec &in_sizes, const ivec &in_times ) {
         len = in_names.length();
-        bdm_assert_debug ( in_names.length() == in_times.length(), "check \"times\" " );
-        bdm_assert_debug ( in_names.length() == in_sizes.length(), "check \"sizes\" " );
+        bdm_assert ( in_names.length() == in_times.length(), "check \"times\" " );
+        bdm_assert ( in_names.length() == in_sizes.length(), "check \"sizes\" " );
 
         times.set_length ( len );

library/bdm/base/bdmbase.h

@@ -35 +35 @@
         //!Default constructor
         str ( ivec ids0, ivec times0 ) : ids ( ids0 ), times ( times0 ) {
-                bdm_assert_debug ( times0.length() == ids0.length(), "Incompatible input" );
+                bdm_assert ( times0.length() == ids0.length(), "Incompatible input" );
         };
 };
@@ -183 +183 @@
         //! returns name of a scalar at position scalat, i.e. it can be in the middle of vector name, in that case it adds "_%d" to it
         std::string scalarname ( int scalat ) const {
-                bdm_assert_debug(scalat<dsize,"Wrong input index");
+                bdm_assert(scalat<dsize,"Wrong input index");
                 int id=0;
                 int scalid=0;
@@ -995 +995 @@
         //! Register DS for logging into logger L
         virtual void log_add ( logger &L ) {
-                bdm_assert_debug ( dtsize == Drv._dsize(), "invalid DS: dtsize (" + num2str ( dtsize ) + ") different from Drv " + num2str ( Drv._dsize() ) );
-                bdm_assert_debug ( utsize == Urv._dsize(), "invalid DS: utsize (" + num2str ( utsize ) + ") different from Urv " + num2str ( Urv._dsize() ) );
+                bdm_assert ( dtsize == Drv._dsize(), "invalid DS: dtsize (" + num2str ( dtsize ) + ") different from Drv " + num2str ( Drv._dsize() ) );
+                bdm_assert ( utsize == Urv._dsize(), "invalid DS: utsize (" + num2str ( utsize ) + ") different from Urv " + num2str ( Urv._dsize() ) );
 
                 L_dt = L.add ( Drv, "" );

library/bdm/base/loggers.h

@@ -49 +49 @@
 
         void logit ( int id, const vec &v ) {
-                bdm_assert_debug ( id < vectors.length(), "Logger was not initialized, run init()." );
+                bdm_assert ( id < vectors.length(), "Logger was not initialized, run init()." );
                 if ( id >= 0 ) {
                         vectors ( id ).set_row ( ind, v );

library/bdm/base/user_info.h

@@ -321 +321 @@
 
                 root *typeless_instance = related_UI.new_instance();
-                bdm_assert_debug ( typeless_instance, "UI::new_instance failed" );
+                bdm_assert ( typeless_instance, "UI::new_instance failed" );
 
                 instance = dynamic_cast<T*> ( typeless_instance );
@@ -351 +351 @@
                 T *tmp_inst = 0;
                 from_setting ( tmp_inst, element );
-                bdm_assert_debug ( tmp_inst, "UI::from_setting failed" );
+                bdm_assert ( tmp_inst, "UI::from_setting failed" );
                 instance = tmp_inst;
         }