Changeset 892

Timestamp:

04/04/10 16:33:41 (15 years ago)

Author:

mido

Message:

trivial commit - sources of datasources reformatted and astylled without changing any functionality

Location:

library/bdm/base

Files:

• datasources.cpp (modified) (2 diffs)
• datasources.h (modified) (4 diffs)

library/bdm/base/datasources.cpp

@@ -42 +42 @@
 }
 
+void ITppFileDS::from_setting ( const Setting &set ) {
+        shared_ptr<RV> rvtmp = UI::build<RV> ( set, "rv" , UI::compulsory );
+
+        it_file it ( set["filename"] );
+        it << Name ( set["varname"] );
+        it >> Data;
+        time = 0;
+        //rowid and delays are ignored
+        rowid = linspace ( 0, Data.rows() - 1 );
+        set_drv ( *rvtmp, RV() );
+}
+
 void PdfDS::step() {
         yt2rgr.store_data ( yt ); // y is now history
@@ -71 +83 @@
         dt.set_subvector ( yt.length(), xt );
         dt.set_subvector ( ytsize, ut );
-}
-
-// void ArxDS::step() {
-//      //shift history
-//      H.shift_right ( 0, dt_size );
-//
-//      H.set_subvector ( dt_size - utsize, U ); // write U after Drv
-//
-//      //get regressor
-//      rgr = rgrlnk.pushdown ( H );
-//      // Eval Y
-//      H.set_subvector ( 0, model.samplecond ( rgr ) );
-//
-// }
-//
-// void ArxDS::from_setting ( const Setting &set ) {
-//      shared_ptr<RV> yrv = UI::build<RV> ( set, "y" , UI::compulsory );
-//      shared_ptr<RV> urv = UI::build<RV> ( set, "u" , UI::compulsory );
-//      shared_ptr<RV> rrv = UI::build<RV> ( set, "rgr" , UI::compulsory );
-//
-//      mat Th;
-//      UI::get ( Th, set, "theta", UI::compulsory );
-//
-//      vec mu0;
-//      if ( !UI::get ( mu0, set, "offset" ) )
-//              mu0 = zeros ( yrv->_dsize() );
-//
-//      mat sqR;
-//      UI::get ( sqR, set, "r", UI::compulsory );
-//      set_parameters ( Th, mu0, sqR );
-//      set_drv ( *yrv, *urv, *rrv );
-//
-//      if ( set.exists ( "opt" ) )
-//              set_options ( set["opt"] );
-// }
-
-CsvFileDS::CsvFileDS ( const string& fname, const string& orientation ) : FileDS() {
-        time = 0;
-
-        vec data_line;
-        string line;
-
-        ifstream fs;
-        fs.open ( fname.c_str() );
-        if ( fs.is_open() ) {
-                while ( getline ( fs, line ) ) {
-                        data_line.set ( line );
-                        Data.append_row ( data_line );
-                }
-        }
-
-        if ( orientation == "BY_ROW" ) {
-                transpose ( Data, Data );
-        }
-
-
-}
-
-//! Auxiliary function building full history of rv0
-RV fullrgr ( const RV &drv0, const RV &urv0, const RV &rrv0 ) {
-        RV T ( urv0 );
-        RV pom = concat ( drv0, urv0 );
-        int mint = rrv0.mint();
-        for ( int i = 0; i > mint; i-- ) {
-                pom.t_plus ( -1 );
-                T.add ( pom );
-        }
-        return T;
-}
-
-void ITppFileDS::from_setting ( const Setting &set ) {
-        shared_ptr<RV> rvtmp = UI::build<RV> ( set, "rv" , UI::compulsory );
-
-        it_file it ( set["filename"] );
-        it << Name ( set["varname"] );
-        it >> Data;
-        time = 0;
-        //rowid and delays are ignored
-        rowid = linspace ( 0, Data.rows() - 1 );
-        set_drv ( *rvtmp, RV() );
 }
 

library/bdm/base/datasources.h

@@ -13 +13 @@
 #ifndef DATASOURCE_H
 #define DATASOURCE_H
-
 
 #include "../base/bdmbase.h"
@@ -104 +103 @@
 UIREGISTER ( MemDS );
 
+/*! Pseudovirtual class for reading data from files
+
+*/
+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 {};
+};
+
+/*!
+* \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:
+        //! Convenience constructor
+        ITppFileDS ( const string &fname, const string &varname ) : FileDS() {
+                it_file it ( fname );
+                it << Name ( varname );
+                it >> Data;
+                time = 0;
+                //rowid and delays are ignored
+        };
+
+        ITppFileDS () : FileDS() {
+        };
+
+        void from_setting ( const Setting &set );
+
+        // TODO dodelat void to_setting( Setting &set ) const;
+
+};
+
+UIREGISTER ( ITppFileDS );
+SHAREDPTR ( ITppFileDS );
+
+/*!
+* \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" );
+};
+
+
+
+// ARXDs - DELETED
+
 /*!  \brief Simulate data from a static pdf (epdf)
 
@@ -129 +201 @@
         }
 
-        //! Accepts action variable and schedule it for application.    
+        //! Accepts action variable and schedule it for application.
         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;
@@ -252 +324 @@
 UIREGISTER ( PdfDS );
 
-/*! Pseudovirtual class for reading data from files
-
-*/
-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 {};
-};
-
-/*!
-* \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:
-        //! Convenience constructor
-        ITppFileDS ( const string &fname, const string &varname ) : FileDS() {
-                it_file it ( fname );
-                it << Name ( varname );
-                it >> Data;
-                time = 0;
-                //rowid and delays are ignored
-        };
-
-        ITppFileDS () : FileDS() {
-        };
-
-        void from_setting ( const Setting &set );
-
-        // TODO dodelat void to_setting( Setting &set ) const;
-
-};
-
-UIREGISTER ( ITppFileDS );
-SHAREDPTR ( ITppFileDS );
-
-/*!
-* \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" );
-};
-
-
-
-// ARXDs - DELETED
-
 //! State-space data source simulating two densities
 class StateDS : public DS {