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

Timestamp:

10/22/09 01:13:47 (15 years ago)

Author:

smidl

Message:

logger refactoring

Files:

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

library/bdm/base/datasources.h

@@ -38 +38 @@
         public:
                 int max_length() {return Data.cols();}
-                void getdata ( vec &dt );
+                void getdata ( vec &dt ) const;
                 void getdata ( vec &dt, const ivec &indeces );
                 void set_drv (const RV &drv,const  RV &urv );
@@ -89 +89 @@
                         set_drv(*r,RV()); //empty urv
                         dtsize=r->_dsize();
+                        ytsize = dtsize;
                         utsize=0;
                 }
@@ -109 +110 @@
                         dt=iepdf->sample();
                 }
-                void getdata ( vec &dt_out ) {
+                void getdata ( vec &dt_out ) const {
                         dt_out = dt;
                 }
@@ -167 +168 @@
                         ut2rgr.step(ut); //u is now history
                 }
-                void getdata ( vec &dt_out ) {
+                void getdata ( vec &dt_out ) const {
                         bdm_assert_debug(dt_out.length()>=utsize+ytsize,"Short output vector");
                         dt_out.set_subvector(0, yt);
@@ -249 +250 @@
                 }
                 //! no sense to log this type
-                void log_add ( logger &L ) {};
+                void log_register(logger &L, const string &prefix){};
                 //! no sense to log this type
-                void logit ( logger &L ) {};
+                void log_write ( ) const {};
 };
 
@@ -341 +342 @@
                 }
 
-                virtual void log_add ( logger &L ) {
-                        DS::log_add ( L );
-                        L_xt = L.add ( IM->_rv(), "true" );
-                }
-                virtual void logit ( logger &L ) {
-                        DS::logit ( L );
-                        L.logit ( L_xt, xt );
+                virtual void log_register(logger &L, const string &prefix){
+                        DS::log_register ( L, prefix ); //ids 0 and 1
+                        
+                        logrec->ids.set_size(3,true);//copy
+                        logrec->ids(2)=logrec->L.add ( IM->_rv(), "true" );
+                }
+                virtual void log_write () {
+                        DS::log_write ( );
+                        logrec->L.logit ( logrec->ids(2), xt );
                 }