Changeset 565 for library/bdm/base/bdmbase.cpp

Timestamp:

08/19/09 16:54:24 (15 years ago)

Author:

vbarta

Message:

using own error macros (basically copied from IT++, but never aborting)

Files:

• library/bdm/base/bdmbase.cpp (modified) (10 diffs)

library/bdm/base/bdmbase.cpp

@@ -42 +42 @@
         } else {
                 id = iter->second;
-                it_assert ( RV_SIZES ( id ) == size, "RV " + name + " of different size already exists" );
+                bdm_assert_debug ( RV_SIZES ( id ) == size, "RV " + name + " of different size already exists" );
         }
         return id;
@@ -67 +67 @@
 void RV::init ( const Array<std::string> &in_names, const ivec &in_sizes, const ivec &in_times ) {
         len = in_names.length();
-        it_assert_debug ( in_names.length() == in_times.length(), "check \"times\" " );
-        it_assert_debug ( in_names.length() == in_sizes.length(), "check \"sizes\" " );
+        bdm_assert_debug ( in_names.length() == in_times.length(), "check \"times\" " );
+        bdm_assert_debug ( in_names.length() == in_sizes.length(), "check \"sizes\" " );
 
         times.set_length ( len );
@@ -135 +135 @@
 
 shared_ptr<mpdf> epdf::condition (const RV &rv) const {
-        it_warning ("Not implemented");
+        bdm_warning ("Not implemented");
         return shared_ptr<mpdf>();
 }
 
 shared_ptr<epdf> epdf::marginal (const RV &rv) const {
-        it_warning ("Not implemented");
+        bdm_warning ("Not implemented");
         return shared_ptr<epdf>();
 }
@@ -194 +194 @@
         v2v_up = rv.dataind (rv_up);
 
-        it_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
+        bdm_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
 }
 
@@ -202 +202 @@
         v2v_up = upind;
 
-        it_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
+        bdm_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
 }
 
@@ -219 +219 @@
 
 void datalink_m2e::pushup_cond (vec &val_up, const vec &val, const vec &cond) {
-        it_assert_debug (downsize == val.length(), "Wrong val");
-        it_assert_debug (upsize == val_up.length(), "Wrong val_up");
+        bdm_assert_debug (downsize == val.length(), "Wrong val");
+        bdm_assert_debug (upsize == val_up.length(), "Wrong val_up");
         set_subvector (val_up, v2v_up, val);
         set_subvector (val_up, v2c_up, cond);
@@ -259 +259 @@
                 }
         }
-        it_assert_debug ( res.length() == dsize, "this rv is not fully present in crv!" );
+
+        bdm_assert_debug ( res.length() == dsize, "this rv is not fully present in crv!" );
         return res;
 
@@ -294 +295 @@
                 }
         }
-        it_assert_debug ( selfi.length() == rv2i.length(), "this should not happen!" );
+        bdm_assert_debug ( selfi.length() == rv2i.length(), "this should not happen!" );
 }
 
@@ -322 +323 @@
 void RV::from_setting ( const Setting &set ) {
         Array<string> A;
-        it_assert ( !A.length(), "default array not empty" );
         UI::get ( A, set, "names" );
 
@@ -356 +356 @@
                 rvaddok = rv.add ( mpdfs ( i )->_rv() ); //add rv to common rvs.
                 // If rvaddok==false, mpdfs overlap => assert error.
-                it_assert_debug ( rvaddok || !checkoverlap, "mprod::mprod() input mpdfs overlap in rv!" );
+                bdm_assert_debug ( rvaddok || !checkoverlap, "mprod::mprod() input mpdfs overlap in rv!" );
         }