Changeset 477 for library/bdm/base/loggers.cpp

Timestamp:

08/05/09 14:40:03 (15 years ago)

Author:

mido

Message:

panove, vite, jak jsem peclivej na upravu kodu.. snad se vam bude libit:) konfigurace je v souboru /system/astylerc

Files:

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

library/bdm/base/loggers.cpp

@@ -8 +8 @@
 #endif
 
-namespace bdm{
+namespace bdm {
 void memlog::itsave ( const char* fname ) {
         it_file itf ( fname );
         int i;
-        string vec_name="";
+        string vec_name = "";
         int istart, iend;
-        for ( i=0; i<entries.length();i++ ) {
-                istart=0;
-                for (int j=0; j<entries(i).length(); j++){ // same for as in add!!!
-                        vec_name = names(i) + entries(i).name(j);
-                        iend=istart+entries(i).size(j)-1;
-                        itf << Name ( vec_name ) << vectors ( i ).get_cols(istart,iend);
+        for ( i = 0; i < entries.length(); i++ ) {
+                istart = 0;
+                for ( int j = 0; j < entries ( i ).length(); j++ ) { // same for as in add!!!
+                        vec_name = names ( i ) + entries ( i ).name ( j );
+                        iend = istart + entries ( i ).size ( j ) - 1;
+                        itf << Name ( vec_name ) << vectors ( i ).get_cols ( istart, iend );
                         // move start after current end...
-                        istart=iend+1;
+                        istart = iend + 1;
                 }
-                
+
         }
 }
 
-void memlog::from_setting( const Setting &set ) 
-{       
+void memlog::from_setting ( const Setting &set ) {
         // TODO tady se natvrdo ocekava existence stringu, nejsou zadne defaulty.. je to tak OK?
-        string itfilename = (const char*)set["filename"];
+        string itfilename = ( const char* ) set["filename"];
         maxlen = set["maxlen"];
 }
 
 void dirfilelog::init() {
-        int i,j,k;
-        int nsc=0;
-        for ( i=0;i<entries.length();i++ ) {nsc+=entries ( i )._dsize();}
+        int i, j, k;
+        int nsc = 0;
+        for ( i = 0; i < entries.length(); i++ ) {
+                nsc += entries ( i )._dsize();
+        }
         ; //all entries!!
 
@@ -51 +52 @@
         scalarnames.set_length ( nsc );
         // For all entries
-        int ii=0;
-        for ( i=0;i<entries.length();i++ ) { //for entries
-                for ( j=0;j<entries ( i ).length();j++ ) { //for RVs in entries
+        int ii = 0;
+        for ( i = 0; i < entries.length(); i++ ) { //for entries
+                for ( j = 0; j < entries ( i ).length(); j++ ) { //for RVs in entries
                         int rvsize = entries ( i ).size ( j );
                         // for non-empty names
-                        if (names(i).length()>0) {scalarnames(ii)=names(i) + "_";}
+                        if ( names ( i ).length() > 0 ) {
+                                scalarnames ( ii ) = names ( i ) + "_";
+                        }
                         // add name
                         scalarnames ( ii ) +=  entries ( i ).name ( j );
                         // add number when needed
-                        if ( rvsize >1 ) {
+                        if ( rvsize > 1 ) {
                                 // copy the same name for th whole RV
-                                for ( k=1;k<rvsize;k++ ) {scalarnames(ii+k)=scalarnames(ii);}
+                                for ( k = 1; k < rvsize; k++ ) {
+                                        scalarnames ( ii + k ) = scalarnames ( ii );
+                                }
                                 // add numbers
-                                for ( k=0;k<rvsize;k++ ) { //for all scalars in given RV
-                                        sprintf ( num,"%d",k );
-                                        scalarnames ( ii ) += (std::string)"_" + num;
+                                for ( k = 0; k < rvsize; k++ ) { //for all scalars in given RV
+                                        sprintf ( num, "%d", k );
+                                        scalarnames ( ii ) += ( std::string ) "_" + num;
                                         ii++;
                                 }
-                        } 
-                        else {
-                                ii++;}
+                        } else {
+                                ii++;
+                        }
                 }
         }
         //Create format
-        string frm="format";
+        string frm = "format";
         get_fname ( filename, dirname, frm );
 
         FILE* fpf;
         fpf = fopen ( filename, "w" );
-        for ( i=0;i<ii;i++ ) {
+        for ( i = 0; i < ii; i++ ) {
                 fprintf ( fpf, "%s RAW d 1\n", scalarnames ( i ).c_str() );
         }
@@ -94 +99 @@
 void dirfilelog::write_buffers ( int Len ) {
         int fp;
-        int nen=entries.length(); //all entries!!
+        int nen = entries.length(); //all entries!!
         double *Dt;
         int DtRows;
-        int i,j,k;
+        int i, j, k;
         int ii; //index in scalarnames;
         int jj; //index in vectors()
         char filename[200];
 
-        it_assert_debug ( Len<=maxlen,"diffilelog" );
+        it_assert_debug ( Len <= maxlen, "diffilelog" );
 
         ii = 0;
-        for ( i=0;i<nen;i++ ) { //for entries
+        for ( i = 0; i < nen; i++ ) { //for entries
                 Dt = vectors ( i )._data();
                 DtRows = vectors ( i ).rows();
 
-                jj=0;
-                for ( j=0;j<entries ( i ).length();j++ ) { //for RVs in entries
+                jj = 0;
+                for ( j = 0; j < entries ( i ).length(); j++ ) { //for RVs in entries
                         int rvsize = entries ( i ).size ( j );
-                        for ( k=0;k<rvsize;k++ ) { { //for all scalars in given RV
-                                        get_fname ( filename,dirname,scalarnames ( ii ) );
-                                        if ( Len==0 ) //initialization
+                        for ( k = 0; k < rvsize; k++ ) { { //for all scalars in given RV
+                                        get_fname ( filename, dirname, scalarnames ( ii ) );
+                                        if ( Len == 0 ) //initialization
                                                 fp = open ( filename, O_CREAT | O_WRONLY | O_TRUNC, 00644 );
                                         else
                                                 fp = open ( filename, O_CREAT | O_WRONLY | O_APPEND, 00644 );
 
-                                        write ( fp,&Dt[jj* ( DtRows ) ], ( Len ) *sizeof ( double ) );
+                                        write ( fp, &Dt[jj* ( DtRows ) ], ( Len ) *sizeof ( double ) );
                                         close ( fp );
 
@@ -134 +139 @@
 void dirfilelog::step ( ) {
 
-        if ( ind== ( maxlen -1 ) ) {
-                write_buffers ( ind+1 );
+        if ( ind == ( maxlen - 1 ) ) {
+                write_buffers ( ind + 1 );
                 ind = 0;
-        }
-        else
+        } else
                 ind++;
 
@@ -144 +148 @@
 
 void dirfilelog::finalize ( ) {
-        if ( ind>0 )
+        if ( ind > 0 )
                 write_buffers ( ind ); //assuming here that i+1 was not filled
 }
 
 
-void dirfilelog::from_setting( const Setting &set ) 
-{       
+void dirfilelog::from_setting ( const Setting &set ) {
         // TODO tady se natvrdo ocekava existence stringu, nejsou zadne defaulty.. je to tak OK?
-        dirname = (const char*)set["dirname"];
+        dirname = ( const char* ) set["dirname"];
         maxlen = set["maxlen"];
-        scalarnames.set_length(0);
+        scalarnames.set_length ( 0 );
 }