Changeset 1055 for library

Timestamp:

06/07/10 22:00:07 (14 years ago)

Author:

smidl

Message:

DS now owns its data record dt -- getdata() will become obsolete soon

Files:

• library/bdm/base/bdmbase.h (modified) (2 diffs)

library/bdm/base/bdmbase.h

@@ -1185 +1185 @@
         RV Urv; //
 public:
+        //! publicly acessible vector of observations
+        vec dt;
+        //! publicly writeble vector of inputs
+        vec ut;
+        
         //! default constructors
         DS() : dtsize ( 0 ), utsize ( 0 ), Drv(), Urv(){
@@ -1196 +1201 @@
         }
         //! Returns full vector of observed data=[output, input]
-        virtual void getdata ( vec &dt ) const = 0;
+        virtual void getdata ( vec &dt_out ) const {
+                bdm_assert_debug(dtsize==dt.length(),"DS::getdata: dt is not of declared size;"); 
+                dt_out=dt;
+        };
 
         //! Returns data records at indices. Default is inefficent.
-        virtual void getdata ( vec &dt, const ivec &indices ) {
-                vec tmp(dtsize);
-                getdata(tmp);
-                dt = tmp(indices);
+        virtual void getdata ( vec &dt_out, const ivec &indices ) {
+                bdm_assert_debug(max(indices)<dt.length(), "DS::getdata: indeces out of bounds");
+                dt_out = dt(indices);
         };