Changeset 965

Timestamp:

05/21/10 00:44:25 (14 years ago)

Author:

smidl

Message:

nicer RV

Files:

• library/bdm/base/bdmbase.cpp (modified) (4 diffs)

library/bdm/base/bdmbase.cpp

@@ -33 +33 @@
         if ( iter == MAP.end() || name.length() == 0 ) { //add new RV
                 id = MAP.size() + 1;
-                //debug
-                /*              {
-                                        cout << endl;
-                                        str2int_map::const_iterator iter = MAP.begin();
-                                        for(str2int_map::const_iterator iter=MAP.begin(); iter!=MAP.end(); iter++){
-                                                cout << "key: " << iter->first << " val: " << iter->second <<endl;
-                                        }
-                                }*/
 
                 MAP.insert ( make_pair ( name, id ) ); //add new rv
@@ -54 +46 @@
                 if ( size > 0 && name.length() > 0 ) {
                         bdm_assert ( SIZES ( id ) == size, "RV " + name + " of size " + num2str ( SIZES ( id ) ) + " exists, requested size " + num2str ( size ) + "can not be assigned" );
-                }
+                } 
         }
         return id;
@@ -243 +235 @@
 std::ostream &operator<< ( std::ostream &os, const RV &rv ) {
         int id;
+        os << "[";
         for ( int i = 0; i < rv.len ; i++ ) {
                 id = rv.ids ( i );
-                os << id << "(" << RV::SIZES ( id ) << ")" <<  // id(size)=
-                "=" << RV::NAMES ( id )  << "_{"  << rv.times ( i ) << "}; "; //name_{time}
-        }
+                os <<  RV::NAMES ( id )  <<  "(" <<  RV::SIZES ( id ) << ")_{"  << rv.times ( i ) << "}; "; //name_{time}
+        }
+        os << "]";
         return os;
 }
@@ -497 +490 @@
         downsize = v2v_down.length() + h2v_down.length();
         upsize = v2v_up.length();
+        
 }