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

Timestamp:

04/09/10 09:31:37 (14 years ago)

Author:

mido

Message:

cleanup of MemDS and its descendants
bdmtoolbox/CMakeLists.txt slightly changed to avoid unnecessary MEX condition
"indeces" replaced by "indices"

Files:

• library/bdm/base/datasources.h (modified) (11 diffs)

library/bdm/base/datasources.h

@@ -32 +32 @@
         //! active column in the Data matrix
         int time;
-        //!  vector of rows that are presented in Dt
-        ivec rowid;
-
-public:
+
+public:
+        //!Default constructor
+        MemDS () {};
+
+        //! Convenience constructor
+        MemDS ( mat &Dat );
+
+        //! returns number of data in the file;
         int max_length() {
                 return Data.cols();
         }
+
         void getdata ( vec &dt ) const;
-        void getdata ( vec &dt, const ivec &indeces );
-        void set_drv ( const RV &drv, const  RV &urv );
+
+        void getdata ( vec &dt, const ivec &indices );
+
+        void set_drv ( const RV &drv );
+
+        void set_drv ( const RV &drv, const RV &urv )
+        {
+                bdm_error ( "MemDS::urv is not supported" );
+        }
 
         void write ( const vec &ut ) {
@@ -52 +65 @@
 
         void step();
-        //!Default constructor
-        MemDS () {};
-        //! Convenience constructor
-        MemDS ( mat &Dat, ivec &rowid0 );
+
         /*! Create object from the following structure
         \code
@@ -63 +73 @@
            drv = {class="RV"; ...} // Identification how rows of the matrix Data will be known to others
            time = 0;               // Index of the first column to user_info,
-           rowid = [1,2,3...];     // ids of rows to be used
         }
         \endcode
@@ -69 +78 @@
         If the optional fields are not given, they will be filled as follows:
         \code
-        rowid= [0, 1, 2, ...number_of_rows_of_Data];
         drv = {names=("ch0", "ch1", "ch2", ..."number_of_rows_of_Data");
               sizes=( 1    1    1 ...);
@@ -76 +84 @@
         time = 0;
         \endcode
-        If \c rowid is given, \c drv will be named after indeces in rowids.
+        If \c rowid is given, \c drv will be named after indices in rowids.
 
         Hence the data provided by method \c getdata() will be full column of matrix Data starting from the first record.
         */
-        void from_setting ( const Setting &set ) {
-                UI::get ( Data, set, "Data", UI::compulsory );
-                if ( !UI::get ( time, set, "time", UI::optional ) ) {
-                        time = 0;
-                }
-                if ( !UI::get ( rowid, set, "rowid", UI::optional ) ) {
-                        rowid = linspace ( 0, Data.rows() - 1 );
-                }
-                shared_ptr<RV> r = UI::build<RV> ( set, "drv", UI::optional );
-                if ( !r ) {
-                        r = new RV();
-                        for ( int i = 0; i < rowid.length(); i++ ) {
-                                r->add ( RV ( "ch" + num2str ( rowid ( i ) ), 1, 0 ) );
-                        }
-                }
-                set_drv ( *r, RV() ); //empty urv
-                dtsize = r->_dsize();
-                utsize = 0;
-        }
+        void from_setting ( const Setting &set );
 };
 UIREGISTER ( MemDS );
@@ -106 +96 @@
 */
 class FileDS: public MemDS {
-
-public:
-        void getdata ( vec &dt ) {
-                dt = Data.get_col ( time );
-        }
-
-        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() {
-                return Data.cols();
-        }
-        //! no sense to log this type
-        void log_register ( logger &L, const string &prefix ) {};
-        //! no sense to log this type
-        void log_write ( ) const {};
+protected:
+        string filename;
+public:
+        void from_setting ( const Setting & set );
 };
 
@@ -142 +117 @@
                 it >> Data;
                 time = 0;
-                //rowid and delays are ignored
+                //delays are ignored
         };
 
@@ -165 +140 @@
 */
 class CsvFileDS: public FileDS {
-
-public:
-        //! Constructor - create DS from a CSV file.
-        CsvFileDS ( const string& fname, const string& orientation = "BY_COL" );
+public:
+        void from_setting ( const Setting & set );
 };
 
@@ -203 +176 @@
         virtual void write ( const vec &ut ) NOT_IMPLEMENTED_VOID;
 
-        //! Accepts action variables at specific indeces
-        virtual void write ( const vec &ut, const ivec &indeces ) NOT_IMPLEMENTED_VOID;
+        //! Accepts action variables at specific indices
+        virtual void write ( const vec &ut, const ivec &indices ) NOT_IMPLEMENTED_VOID;
 
         /*!
@@ -261 +234 @@
 
 
-        //! Returns data records at indeces.
-        virtual void getdata ( vec &dt, const ivec &indeces ) NOT_IMPLEMENTED_VOID;
+        //! Returns data records at indices.
+        virtual void getdata ( vec &dt, const ivec &indices ) NOT_IMPLEMENTED_VOID;
 
 
@@ -364 +337 @@
         }
 
-        virtual void write ( const vec &ut, const ivec &indeces ) NOT_IMPLEMENTED_VOID;
+        virtual void write ( const vec &ut, const ivec &indices ) NOT_IMPLEMENTED_VOID;
 
         /*! UI for stateDS