Changeset 609 for library/bdm/base/datasources.cpp

Timestamp:

09/13/09 23:14:23 (15 years ago)

Author:

smidl

Message:

remove "delays" from memory DS, check length of datasource

Files:

• library/bdm/base/datasources.cpp (modified) (3 diffs)

library/bdm/base/datasources.cpp

@@ -9 +9 @@
         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 ) );
+                dt ( i ) = Data ( rowid ( i ), time );
         }
 }
@@ -18 +18 @@
         for ( i = 0; i < indeces.length(); i++ ) {
                 j = indeces ( i );
-                dt ( i ) = Data ( rowid ( j ), time - delays ( j ) );
+                dt ( i ) = Data ( rowid ( j ), time  );
         }
 }
@@ -35 +35 @@
 }
 
-MemDS::MemDS ( mat &Dat, ivec &rowid0, ivec &delays0 ) : rowid ( rowid0 ), delays ( delays0 ) {
+MemDS::MemDS ( mat &Dat, ivec &rowid0) : rowid ( rowid0 ) {
         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 );
+        time = 0;
         Data = Dat;
 }