Changeset 609 for library

Timestamp:

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

Author:

smidl

Message:

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

Location:

library/bdm

Files:

• base/bdmbase.h (modified) (1 diff)
• base/datasources.cpp (modified) (3 diffs)
• base/datasources.h (modified) (2 diffs)
• mex/mex_datasource.h (modified) (1 diff)
• mex/mex_logger.h (modified) (1 diff)

library/bdm/base/bdmbase.h

@@ -945 +945 @@
                 DS() : Drv(), Urv(),Yrv() {};
 
+        //! Returns maximum number of provided data, by default it is set to maximum allowed length, shorter DS should overload this method! See, MemDS.max_length().
+        virtual int max_length() {return std::numeric_limits< int >::max();}
         //! Returns full vector of observed data=[output, input]
         virtual void getdata ( vec &dt ) {

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;
 }

library/bdm/base/datasources.h

@@ -35 +35 @@
                 //!  vector of rows that are presented in Dt
                 ivec rowid;
-                //! vector of delays that are presented in Dt
-                ivec delays;
-
-        public:
+
+        public:
+                int max_length() {return Data.cols();}
                 void getdata ( vec &dt );
                 void getdata ( vec &dt, const ivec &indeces );
@@ -54 +53 @@
                 //!Default constructor
                 MemDS () {};
-                MemDS ( mat &Dat, ivec &rowid0, ivec &delays0 );
-};
+                MemDS ( mat &Dat, ivec &rowid0);
+                /*! Create object from the following structure
+                \code
+                { class = 'MemDS';
+                   Data = (...);            // Data matrix or data vector
+                   --- optional ---
+                   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
+                
+                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=("0", "1", "2", ..."number_of_rows_of_Data");
+                      sizes=( 1    1    1 ...);
+                          times=( 0    0    0 ...);
+                          };
+                time = 0;
+                \endcode
+                If \c rowid is given, \c drv will be named after indeces 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;
+                }
+};
+UIREGISTER(MemDS);
 
 /*!  \brief Simulate data from a static pdf

library/bdm/mex/mex_datasource.h

@@ -44 +44 @@
                 //set MemDS
                 rowid = linspace(0,Data.rows()-1);
-                delays = zeros_i(Data.rows());
                 dtsize=rowid.length();
                 utsize=0;

library/bdm/mex/mex_logger.h

@@ -47 +47 @@
         //! constructor
         mexlog() : memlog ( 0, "" ) {};
+        //! constructor
+        mexlog(long maxlen0) : memlog ( maxlen0, "" ) {};
         //!
         mxArray* toCell() {