Changeset 899 for library/bdm/base

Timestamp:

04/11/10 22:04:56 (14 years ago)

Author:

smidl

Message:

correction of loggers

Location:

library/bdm/base

Files:

• bdmbase.cpp (modified) (2 diffs)
• loggers.cpp (modified) (1 diff)
• loggers.h (modified) (1 diff)

library/bdm/base/bdmbase.cpp

@@ -206 +206 @@
         upsize = rv_up._dsize();
         v2v_up = rv.dataind ( rv_up );
-        bdm_assert_debug ( v2v_up.length() == downsize, "rv is not fully in rv_up" );
+        bdm_assert_debug ( v2v_up.length() == downsize, string("rv (" + rv.to_string() + ") is not fully in rv_up(" + rv_up.to_string()) );
 }
 
@@ -430 +430 @@
         if ( rv._dsize() > 0 ) {
                 id = entries.length();
-                names = concat ( names, prefix ); // diff
-                if( name.length() > 0 )
-                {
-                        concat( names, separator );
-                        concat( names, name );
+                if( name.length() > 0 ) {
+                        names = concat ( names, prefix + separator + name); // diff
+                } else {
+                        names = concat ( names, prefix ); // diff
                 }
                 entries.set_length ( id + 1, true );

library/bdm/base/loggers.cpp

@@ -37 +37 @@
                 istart = 0;
                 for ( int j = 0; j < entries ( i ).length(); j++ ) { // same for as in add!!!
-                        vec_name = names ( i ) + entries ( i ).name ( j );
+                        vec_name = names ( i ) + separator + entries ( i ).name ( j );
                         iend = istart + entries ( i ).size ( j ) - 1;
                         itf << Name ( vec_name ) << vectors ( i ).get_cols ( istart, iend );

library/bdm/base/loggers.h

@@ -107 +107 @@
                 for ( int i = 0; i < entries.length(); i++ ) {
                         if ( entries ( i )._dsize() == 1 ) {
-                                cout << names ( i ) << entries ( i ).name ( 0 ) << "\t";
+                                cout << names ( i ) << separator << entries ( i ).name ( 0 ) << "\t";
                         } else
                                 for ( int j = 0; j < vectors ( i ).cols(); j++ ) {
-                                        cout << names ( i ) << entries ( i ).scalarname ( j ) << "\t";
+                                        cout << names ( i ) << separator << entries ( i ).scalarname ( j ) << "\t";
                                 }
                 }