Changeset 308 for bdm/stat/libDS.h

Timestamp:

04/09/09 09:13:35 (15 years ago)

Author:

dedecius

Message:

libDS.h & libDS.cpp - made 'pseudo'virtual object FileDS, which is a parent of ItppFileDS (the original FileDS) and CsvFileDS (for parsing data from CSV files).

Files:

• bdm/stat/libDS.h (modified) (3 diffs)

bdm/stat/libDS.h

@@ -50 +50 @@
 };
 
-/*! Read Data Matrix from an IT file
+/*! Pseudovirtual class for reading data from files
 
 */
@@ -56 +56 @@
 
 public:
-        FileDS ( const string &fname, const string &varname ) :MemDS() {
-                it_file it ( fname );
-                it << Name ( varname ); 
-                it >> Data;
-                time =0;
-                //rowid and delays are ignored
-        }
         void getdata ( vec &dt ) {
                 it_assert_debug ( dt.length() ==Data.rows(),"" );
@@ -76 +69 @@
         int ndat(){return Data.cols();}
 };
+
+/*! 
+* \brief Read Data Matrix from an IT file
+
+The constructor creates an internal matrix \c Data from an IT++ file. The file is binary and can be made using the IT++ library or the Matlab/Octave function itsave. NB: the data are stored columnwise, i.e. each column contains the data for time \f$t\f$!
+
+*/
+class ItppFileDS: public FileDS {
+
+public:
+        ItppFileDS ( const string &fname, const string &varname ) :FileDS() {
+                it_file it ( fname );
+                it << Name ( varname ); 
+                it >> Data;
+                time = 0;
+                //rowid and delays are ignored
+        }
+};
+
+/*!
+* \brief CSV file data storage
+The constructor creates \c Data matrix from the records in a CSV file \c fname. The orientation can be of two types:
+1. \c BY_COL which is default - the data are stored in columns; one column per time \f$t\f$, one row per data item.
+2. \c BY_ROW if the data are stored the classical CSV style. Then each column stores the values for data item, for ex. \f$[y_{t} y_{t-1} ...]\f$, one row for each discrete time instant.
+
+*/
+class CsvFileDS: public FileDS {
+
+public:
+        //! Constructor - create DS from a CSV file.
+        CsvFileDS ( const string& fname, const string& orientation = "BY_COL" );
+};
+
+
 
 /*!