added virtual equilibration.

diff --git a/configcache.cpp b/configcache.cpp
index 3a76a555d1f2a0f08aad9932a087e385ae26c5e4..7409b39d433be5262c48c29bdfe75bd587b7c5e0 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -43,24 +43,28 @@ void configcache::fetchDataFiles()
 {
   struct dirent *de=NULL;
   DIR *d=NULL;
+  static infiledesc filedesc;
   
   d=opendir(DATADIR.c_str());
   if(d != NULL){
     while(de = readdir(d)){
       string filename = de->d_name;
-      if(isValidInFile(filename)) 
+      if(isValidInFile(filename, &filedesc)) 
        {
-         inFiles.push_back(filename);
+         inFiles.push_back(filedesc);
        }
     }
   }
 }
 
-bool configcache::isValidInFile(const string& infile)
+bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 {
   char *inchar, *inParts;
   string truncIn, truncOut;
 
+  filedesc->filename = infile;
+  filedesc->doVirtualEquilibration = false;
+
   if( infile.size() < 4 ) return false;
 
   if( infile.substr(infile.size()-3) != "dat" ) return false;
@@ -76,8 +80,18 @@ bool configcache::isValidInFile(const string& infile)
       switch(iPart)
        {
        case 1: if(inParts != CACHEID) return false; break;
-       case 2: if(atoi(inParts) != NEQUI) return false; break;
-       case 3: if(atoi(inParts) != NSKIP) return false; break;
+       case 2: 
+         if (atoi(inParts) > NEQUI) 
+           return false; 
+         else if (atoi(inParts) < NEQUI)
+           filedesc->doVirtualEquilibration = true;
+         filedesc->nequi = atoi(inParts);
+         break;
+       case 3: 
+         if(atoi(inParts) != NSKIP) 
+           return false;
+         filedesc->nskip = atoi(inParts);
+         break;
        }
       inParts = strtok( NULL, "_");
     }
@@ -105,10 +119,10 @@ bool configcache::readConfig()
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
        {
-         if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back() << endl << flush;
+         if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
 
-         openFileName = inFiles.back();
-         inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
+         openFileDesc = inFiles.back();
+         inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
          inFiles.pop_back();
 
          if( !inFile.is_open() ) continue;
@@ -120,28 +134,22 @@ bool configcache::readConfig()
 
       if( inFile.is_open() ) 
        {
-         int readturn = -1;
-         try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
-         catch(boost::iostreams::bzip2_error& error) { 
-           if(out) *out->log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
-           inFile.close();
-         } 
-         catch (std::exception const& ex) {
-           if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
-           inFile.close();
-         }
-         catch( ... ) {
-           if(out) *out->log << "CCACHE: Caught unknown exception while reading." << endl << flush;
-           inFile.close();
+         if (openFileDesc.doVirtualEquilibration) {
+           *out->log << "CCACHE: Trying virtual equilibration." << endl << flush;
+           openFileDesc.doVirtualEquilibration = false;
+           for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
+             if( readConfigToMem(tmpConfig) != configSize || ! inFile.is_open() )
+               break;
+           }
          }
-         
-         if( readturn == configSize && inFile.is_open() )
+
+         if( readConfigToMem(tmpConfig) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);
              return true;
            }
          else {
-           *out->log << "CCACHE: Closing dat-file: " << openFileName << endl << flush;
+           *out->log << "CCACHE: Closing dat-file: " << openFileDesc.filename << endl << flush;
            inFile.close();
          }
        }
@@ -210,3 +218,24 @@ void configcache::finishOutFile()
       rename( outFileName.str().c_str(), outFileName.str().substr(0, outFileName.str().size()-4).c_str() );
     }
 }
+
+int configcache::readConfigToMem(char *tmpConfig)
+{
+  int readturn = -1;
+
+  try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
+  catch(boost::iostreams::bzip2_error& error) { 
+    if(out) *out->log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
+    inFile.close();
+  } 
+  catch (std::exception const& ex) {
+    if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
+    inFile.close();
+  }
+  catch( ... ) {
+    if(out) *out->log << "CCACHE: Caught unknown exception while reading." << endl << flush;
+    inFile.close();
+  }
+
+  return readturn;
+}

diff --git a/configcache.h b/configcache.h
index e61bb3f903b813a9f4caa8f62fac76becdc61492..3dda989c437de8b221c209d5ba70cce7dfef8d53 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -25,6 +25,13 @@ struct parameter{
   double val;
 };
 
+struct infiledesc {
+  string filename;
+  int nequi;
+  int nskip;
+  bool doVirtualEquilibration;
+};
+
 class configcache{
  public:
   ~configcache();
@@ -36,7 +43,7 @@ class configcache{
   void setPara(const string& parid, const double& value);
   
  private:
-  string openFileName;
+  infiledesc openFileDesc;
   void finishOutFile();
   int getParIndex(const string& parid);
   int NEQUI;
@@ -68,11 +75,13 @@ class configcache{
 
   void fetchDataFiles();
   
-  bool isValidInFile(const string& infile);
+  bool isValidInFile(const string& infile, infiledesc *filedesc);
 
-  vector<string> inFiles;
+  vector<infiledesc> inFiles;
 
   vector<parameter> Paras;
+
+  int readConfigToMem(char *tmpConfig);
 };
 
 #endif