Changeset 565 for library/bdm/base/datasources.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/datasources.cpp (modified) (4 diffs)

library/bdm/base/datasources.cpp

@@ -7 +7 @@
         int i;
 
-        it_assert_debug ( dt.length() == rowid.length(), "MemDS:getdata incompatible dt" );
+        bdm_assert_debug ( dt.length() == rowid.length(), "MemDS:getdata incompatible dt" );
         for ( i = 0; i < rowid.length(); i++ ) {
                 dt ( i ) = Data ( rowid ( i ), time - delays ( i ) );
@@ -15 +15 @@
 void MemDS::getdata ( vec &dt, const ivec &indeces ) {
         int j, i;
-        it_assert_debug ( dt.length() == indeces.length(), "MemDS:getdata incompatible dt" );
+        bdm_assert_debug ( dt.length() == indeces.length(), "MemDS:getdata incompatible dt" );
         for ( i = 0; i < indeces.length(); i++ ) {
                 j = indeces ( i );
@@ -29 +29 @@
 
 void MemDS::set_rvs ( RV &drv, RV &urv ) {
-        it_assert_debug ( drv._dsize() == rowid.length(), "MemDS::set_rvs incompatible drv" );
-        it_assert_debug ( urv._dsize() == 0, "MemDS does not support urv." );
+        bdm_assert_debug ( drv._dsize() == rowid.length(), "MemDS::set_rvs incompatible drv" );
+        bdm_assert_debug ( urv._dsize() == 0, "MemDS does not support urv." );
 
         Drv = drv;
@@ -36 +36 @@
 
 MemDS::MemDS ( mat &Dat, ivec &rowid0, ivec &delays0 ) : rowid ( rowid0 ), delays ( delays0 ) {
-        it_assert_debug ( max ( rowid ) <= Dat.rows(), "MemDS rowid is too high for given Dat." );
-        it_assert_debug ( max ( delays ) < Dat.cols(), "MemDS delays are too high." );
+        bdm_assert_debug ( max ( rowid ) <= Dat.rows(), "MemDS rowid is too high for given Dat." );
+        bdm_assert_debug ( max ( delays ) < Dat.cols(), "MemDS delays are too high." );
 
         time = max ( delays );