implemented partial virtual equilibration.

diff --git a/configcache.cpp b/configcache.cpp
index 1095775e8b097dd9afaf8a641d6a10f17630619c..a3490ad9574337c6ea59d4cee053dead0afb48bf 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -172,9 +172,12 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
   return NULL;
 }
 

-bool configcache::readConfig(vector<unsigned long> *excludeFileHashes)
-{   
-  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;
+/* returns number of equilibration-steps left */
+int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
+{
+  int nequileft = NEQUI;
+
+  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return nequileft;

 
   if(refetchDataFiles){
     refetchDataFiles = false;
 
   if(refetchDataFiles){
     refetchDataFiles = false;


@@ -183,7 +186,7 @@ bool configcache::readConfig(vector<unsigned long> *excludeFileHashes)
 
   while(true)
     {
 
   while(true)
     {

-      if( (!inFile.is_open()) && inFiles.size() == 0 ) return false;
+      if( (!inFile.is_open()) && inFiles.size() == 0 ) return nequileft;

 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
        bool excludethisfile=false;
 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
        bool excludethisfile=false;


@@ -221,13 +224,17 @@ bool configcache::readConfig(vector<unsigned long> *excludeFileHashes)
            for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;
            for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;

+             else if ( (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip < nequileft ) {
+               memcpy(configMem, tmpConfig, configSize);
+               nequileft = (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip;
+             }

            }
          }
 
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);
            }
          }
 
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);

-             return true;
+             return -1;

            }
          else {
            if(out) *out->log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
            }
          else {
            if(out) *out->log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;

diff --git a/configcache.h b/configcache.h
index 17c8606311f1e7536098777f127969acb2ddd31c..f07ccf50f1cb51ae682f5dc17425fa4e70285243 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -38,7 +38,7 @@ class configcache{
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
              const int& cachemode=CACHE_MODE_FULL, writeout *out_a=NULL);
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
              const int& cachemode=CACHE_MODE_FULL, writeout *out_a=NULL);

-  bool readConfig(vector<unsigned long> *excludeFileHashes=NULL);
+  int readConfig(vector<unsigned long> *excludeFileHashes=NULL);

   void writeConfig();
   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);
   void writeConfig();
   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);

diff --git a/hypercache.cpp b/hypercache.cpp
index b025ba69822763723c7478271a1b037538cc861e..2d38b2168b1ec70d162fdb1cb767da8dfad46a30 100644 (file)
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -71,10 +71,12 @@ string hypercache::fileOfPath(const string& dressedfile) {
   return dressedfile.substr(dressedfile.find_last_of("\\/")+1);
 }
 
   return dressedfile.substr(dressedfile.find_last_of("\\/")+1);
 }
 

-bool hypercache::readC() { 
-  bool readret;
+int hypercache::readC() { 
+  int readret;

 
 

-  if ( readret = C->readConfig(&parentConfigs) )
+  readret = C->readConfig(&parentConfigs);
+
+  if ( readret == -1 )

     activeCFile = fileOfPath(C->getInFileName());
   else
     activeCFile = "";
     activeCFile = fileOfPath(C->getInFileName());
   else
     activeCFile = "";


@@ -96,15 +98,17 @@ void hypercache::writeO() {
   O->writeConfig(); 
 }
 
   O->writeConfig(); 
 }
 

-bool hypercache::readO() {
-  bool readret;
+int hypercache::readO() {
+  int readret;
+
+  readret = O->readConfig();

 
 

-  if ( readret = O->readConfig() ) {
+  if ( readret == -1 ) {

     unsigned long *parentconfig = (unsigned long*)O->getHeader("concurrent_cfile");
     if ( parentconfig != NULL )
       addParentConfig(parentconfig);
   }
     unsigned long *parentconfig = (unsigned long*)O->getHeader("concurrent_cfile");
     if ( parentconfig != NULL )
       addParentConfig(parentconfig);
   }

-
+  

   return readret;
 }
 
   return readret;
 }
 

diff --git a/hypercache.h b/hypercache.h
index 11e1565148047d926370cbe9f73b12d522fc96a0..f7c039c0704e8cfedd24342ffa525bf7c1ce88fd 100644 (file)
--- a/hypercache.h
+++ b/hypercache.h
@@ -20,8 +20,8 @@ class hypercache {
   
   static void addPara(const string& parid, const double& val=0);
   static void setPara(const string& parid, const double& value);
   
   static void addPara(const string& parid, const double& val=0);
   static void setPara(const string& parid, const double& value);

-  static bool readO();
-  static bool readC();
+  static int readO();
+  static int readC();

   static void writeO();
   static void writeC();
   static void writeHeaderO(const string& headerid, char *header, long unsigned int size) { O->writeHeader(headerid, header, size); }
   static void writeO();
   static void writeC();
   static void writeHeaderO(const string& headerid, char *header, long unsigned int size) { O->writeHeader(headerid, header, size); }