Changeset 854 for library/bdm

Timestamp:

03/08/10 14:27:03 (14 years ago)

Author:

prikryl

Message:

loggers DS, log only dt

Location:

library/bdm/base

Files:

• bdmbase.cpp (modified) (2 diffs)
• bdmbase.h (modified) (2 diffs)

library/bdm/base/bdmbase.cpp

@@ -528 +528 @@
 
 void DS::log_register ( logger &L,  const string &prefix ) {
-        bdm_assert ( ytsize == Yrv._dsize(), "invalid DS: ytsize (" + num2str ( ytsize ) + ") different from Drv " + num2str ( Yrv._dsize() ) );
-        bdm_assert ( utsize == Urv._dsize(), "invalid DS: utsize (" + num2str ( utsize ) + ") different from Urv " + num2str ( Urv._dsize() ) );
+        bdm_assert ( dtsize == Drv._dsize(), "invalid DS: dtsize (" + num2str ( dtsize ) + ") different from Drv " + num2str ( Drv._dsize() ) );
+        //bdm_assert ( utsize == Urv._dsize(), "invalid DS: utsize (" + num2str ( utsize ) + ") different from Urv " + num2str ( Urv._dsize() ) );
 
         root::log_register ( L, prefix );
         //we know that
         if ( log_level.any() ) {
-                logrec->ids.set_size ( 2 );
-                logrec->ids ( 0 ) = logrec->L.add_vector ( Yrv, prefix );
-                logrec->ids ( 1 ) = logrec->L.add_vector ( Urv, prefix );
+                logrec->ids.set_size ( 1 );
+                logrec->ids ( 0 ) = logrec->L.add_vector ( Drv, prefix );
+        //      logrec->ids ( 1 ) = logrec->L.add_vector ( Urv, prefix );
         }
 }
@@ -542 +542 @@
 void DS::log_write ( ) const {
         if ( log_level.any() ) {
-                vec tmp ( Yrv._dsize() + Urv._dsize() );
+                vec tmp ( Drv._dsize());
                 getdata ( tmp );
                 // d is first in getdata
-                logrec->L.log_vector ( logrec->ids ( 0 ), tmp.left ( Yrv._dsize() ) );
-                // u follows after d in getdata
-                logrec->L.log_vector ( logrec->ids ( 1 ), tmp.mid ( Yrv._dsize(), Urv._dsize() ) );
+                logrec->L.log_vector ( logrec->ids ( 0 ), tmp );
         }
 }

library/bdm/base/bdmbase.h

@@ -891 +891 @@
 
 class DS : public root {
-        LOG_LEVEL(DS,jednicka);
+        LOG_LEVEL(DS,dt);
 protected:
         //! size of data returned by \c getdata()
@@ -908 +908 @@
         //! default constructors
         DS() : dtsize ( 0 ), utsize ( 0 ), ytsize ( 0 ), Drv(), Urv(), Yrv() {
-                log_level[jednicka] = true;
+                log_level[dt] = true;
         };