Changeset 737 for library/bdm/base/bdmbase.cpp

Timestamp:

11/25/09 12:14:38 (15 years ago)

Author:

mido

Message:

ASTYLER RUN OVER THE WHOLE LIBRARY, JUPEE

Files:

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

library/bdm/base/bdmbase.cpp

@@ -19 +19 @@
 }
 
-string RV::show_all(){
-  ostringstream os;
-  for(str2int_map::const_iterator iter=MAP.begin(); iter!=MAP.end(); iter++){
-          os << "key: " << iter->first << " val: " << iter->second <<endl;
-  }
-  return os.str();
+string RV::show_all() {
+        ostringstream os;
+        for ( str2int_map::const_iterator iter = MAP.begin(); iter != MAP.end(); iter++ ) {
+                os << "key: " << iter->first << " val: " << iter->second << endl;
+        }
+        return os.str();
 };
 
@@ -31 +31 @@
         int id;
         str2int_map::const_iterator iter = MAP.find ( name );
-        if ( iter == MAP.end() || name.length()==0) { //add new RV
+        if ( iter == MAP.end() || name.length() == 0 ) { //add new RV
                 id = MAP.size() + 1;
                 //debug
@@ -49 +49 @@
                 NAMES ( id ) = name;
                 SIZES ( id ) = size;
-                bdm_assert(size>0, "RV "+ name +" does not exists. Default size (-1) can not be assigned ");
+                bdm_assert ( size > 0, "RV " + name + " does not exists. Default size (-1) can not be assigned " );
         } else {
                 id = iter->second;
-                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" );
+                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" );
                 }
         }
@@ -368 +368 @@
 
 void RV::to_setting ( Setting &set ) const {
-        Array<string> names(len);
-        ivec sizes(len);
-        for (int i=0; i<len;i++){names(i)=name(i);sizes(i)=size(i);}
-        UI::save(names,set,"names");
-        UI::save(sizes,set,"sizes");
-        UI::save(times,set,"times");
+        Array<string> names ( len );
+        ivec sizes ( len );
+        for ( int i = 0; i < len; i++ ) {
+                names ( i ) = name ( i );
+                sizes ( i ) = size ( i );
+        }
+        UI::save ( names, set, "names" );
+        UI::save ( sizes, set, "sizes" );
+        UI::save ( times, set, "times" );
 }
 
@@ -402 +405 @@
 void BM::bayes_batch ( const mat &Data, const mat &Cond ) {
         for ( int t = 0; t < Data.cols(); t++ ) {
-                bayes ( Data.get_col ( t ), Cond.get_col(t) );
-        }
-}
-}
+                bayes ( Data.get_col ( t ), Cond.get_col ( t ) );
+        }
+}
+}