Changeset 611

Timestamp:

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

Author:

smidl

Message:

new logger - stdlog - designed for easy debuggint in command line

Files:

• applications/bdmtoolbox/mex/estimator.cpp (modified) (1 diff)
• library/bdm/base/datasources.h (modified) (6 diffs)
• library/bdm/base/loggers.h (modified) (1 diff)

applications/bdmtoolbox/mex/estimator.cpp

@@ -131 +131 @@
                 L=new mexlog(Ndat);
                 #else
-                L=new memlog(Ndat, "estimator_logger.it");
+                L=new stdlog();
                 #endif
         }

library/bdm/base/datasources.h

@@ -23 +23 @@
 * \brief Memory storage of off-line data column-wise
 
-The data are stored in an internal matrix \c Data . Each column of Data corresponds to one discrete time observation \f$t\f$. Access to this matrix is via indices \c rowid and \c delays.
+The data are stored in an internal matrix \c Data . Each column of Data corresponds to one discrete time observation \f$t\f$. Access to this matrix is via indices \c rowid.
 
 The data can be loaded from a file.
@@ -56 +56 @@
                 /*! Create object from the following structure
                 \code
-                { class = 'MemDS';
+                { class = "MemDS";
                    Data = (...);            // Data matrix or data vector
                    --- optional ---
-                   drv = {class='RV'; ...} // Identification how rows of the matrix Data will be known to others
+                   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
@@ -68 +68 @@
                 \code
                 rowid= [0, 1, 2, ...number_of_rows_of_Data];
-                drv = {names=("0", "1", "2", ..."number_of_rows_of_Data");
+                drv = {names=("ch0", "ch1", "ch2", ..."number_of_rows_of_Data");
                       sizes=( 1    1    1 ...);
                           times=( 0    0    0 ...);
@@ -93 +93 @@
 UIREGISTER(MemDS);
 
-/*!  \brief Simulate data from a static pdf
+/*!  \brief Simulate data from a static pdf (epdf)
+
 Trivial example of a data source, could be used for tests of some estimation algorithms. For example, simulating data from a mixture model and feeding them to mixture model estimators.
 */
@@ -119 +120 @@
                 /*!
                 \code
-                class = "PdfDS";
-                epdf = {class="epdf_offspring", ...}// list of points
+                class = "EpdfDS";
+                epdf = {class="epdf_offspring", ...}// uncondtitional density to sample from
                 \endcode
 
@@ -126 +127 @@
                 void from_setting ( const Setting &set ) {
                         iepdf=UI::build<epdf> ( set,"epdf",UI::compulsory );
-                        dt = zeros ( iepdf->dimension() );
+                        bdm_assert(iepdf->isnamed(), "Input epdf must be named, check if RV is given correctly");
+                        dt =  iepdf->sample();
+                        dtsize=dt.length();
+                        set_drv(iepdf->_rv(),RV());
+                        utsize =0;
                 }
 };

library/bdm/base/loggers.h

@@ -89 +89 @@
 SHAREDPTR ( memlog );
 
+
+/*! \brief Simple logger used for debugging
+All data records are written out to std from where they could be send to file
+*/
+class stdlog: public memlog{
+        public:
+                //! default constructor
+                stdlog():memlog(1){};
+                
+                void init() {
+                        memlog::init();
+                        for (int i=0; i<entries.length();i++){
+                                if (entries(i)._dsize()==1) {
+                                        cout << names(i) << entries(i).name(0) << "\t";
+                                }
+                                else
+                                for (int j=0; j<vectors(i).cols(); j++){
+                                        cout << names(i) << entries(i).scalarname(j) << "\t";
+                                }
+                        }
+                        cout << endl;
+                        
+                        
+                }
+                //!writes everything out
+                void step() {
+                        for (int i=0; i<vectors.length();i++){
+                                for (int j=0; j<vectors(i).cols(); j++){
+                                        cout << vectors(i)(0,j) << "\t";
+                                }
+                        }
+                        cout << endl;
+                }
+                /*! \brief UI for stdlog
+                
+                TODO dat tam kam patri, a to celej blok
+                
+                \code
+                logger = {
+                        class = "stdlog"; // no parameterization needed
+                }
+                \endcode
+                */
+                void from_setting ( const Setting &set ){
+                }
+                
+};
+UIREGISTER(stdlog);
+
 /*!
 * \brief Logging into dirfile with buffer in memory