Changeset 565 for library/bdm/base/datasources.h

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.h (modified) (4 diffs)

library/bdm/base/datasources.h

@@ -42 +42 @@
         void getdata ( vec &dt, const ivec &indeces );
         void set_rvs ( RV &drv, RV &urv );
+
         void write ( vec &ut ) {
-                it_error ( "MemDS::write is not supported" );
-        }
+                bdm_error ( "MemDS::write is not supported" );
+        }
+
         void write ( vec &ut, ivec &indices ) {
-                it_error ( "MemDS::write is not supported" );
-        }
+                bdm_error ( "MemDS::write is not supported" );
+        }
+
         void step();
         //!Default constructor
@@ -61 +64 @@
 public:
         void getdata ( vec &dt ) {
-                it_assert_debug ( dt.length() == Data.rows(), "" );
                 dt = Data.get_col ( time );
-        };
-        void getdata ( vec &dt, const ivec &indeces ) {
-                it_assert_debug ( dt.length() == indeces.length(), "" );
-                vec tmp ( indeces.length() );
-                tmp = Data.get_col ( time );
-                dt = tmp ( indeces );
-        };
+        }
+
+        void getdata ( vec &dt, const ivec &indices ) {
+                vec tmp = Data.get_col ( time );
+                dt = tmp ( indices );
+        }
+
         //! returns number of data in the file;
         int ndat() {
@@ -151 +153 @@
 public:
         void getdata ( vec &dt ) {
-                //it_assert_debug ( dt.length() ==Drv.count(),"ArxDS" );
                 dt = H;
-        };
+        }
+
         void getdata ( vec &dt, const ivec &indices ) {
-                it_assert_debug ( dt.length() == indices.length(), "ArxDS" );
                 dt = H ( indices );
-        };
+        }
+
         void write ( vec &ut ) {
-                //it_assert_debug ( ut.length() ==Urv.count(),"ArxDS" );
                 U = ut;
-        };
+        }
+
         void write ( vec &ut, const ivec &indices ) {
-                it_assert_debug ( ut.length() == indices.length(), "ArxDS" );
+                bdm_assert_debug ( ut.length() == indices.length(), "ArxDS" );
                 set_subvector ( U, indices, ut );
-        };
+        }
+
         void step();
+
         //!Default constructor
         ArxDS ( ) {};
@@ -288 +292 @@
                 dt0 = dt;
         }
-        void getdata ( vec &dt0, const ivec &indeces ) {
-                dt0 = dt ( indeces );
+
+        void getdata ( vec &dt0, const ivec &indices ) {
+                dt0 = dt ( indices );
         }