...

diff --git a/configcache.cpp b/configcache.cpp
index f642e9f26fc99e2e4f8a685d9673738a56c8e2ea..b6edc173fd26faea06606df901fd01b03754275f 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -72,8 +72,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
   string truncIn, truncOut;
 
   filedesc->filename = infile;
   string truncIn, truncOut;
 
   filedesc->filename = infile;

-  filedesc->doVirtualEquilibration = false;
-  filedesc->firstUsedConfig = true;

 
   if( infile.size() < 4 ) return false;
 
 
   if( infile.size() < 4 ) return false;
 


@@ -98,8 +96,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
            return false;
          break;
        case 2:
            return false;
          break;
        case 2:

-         if (atoi(inParts) < NEQUI)
-           filedesc->doVirtualEquilibration = true;

          filedesc->nequi = atoi(inParts);
          break;
        case 3: 
          filedesc->nequi = atoi(inParts);
          break;
        case 3: 


@@ -205,6 +201,13 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
        openFileDesc = *inFileIt;
 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
        openFileDesc = *inFileIt;
 

+       if (openFileDesc.nequi < NEQUI)
+         doVirtualEquilibration = true;
+       else
+         doVirtualEquilibration = false;
+
+       firstUsedConfig = true;
+

        if(log) *log << "CCACHE: Opening dat-file: " << inFileIt->filename << endl << flush;
        inFile.open( (DATADIR + "/" + inFileIt->filename).c_str(), std::ios::binary );
        
        if(log) *log << "CCACHE: Opening dat-file: " << inFileIt->filename << endl << flush;
        inFile.open( (DATADIR + "/" + inFileIt->filename).c_str(), std::ios::binary );
        


@@ -219,9 +222,11 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 
       if( inFile.is_open() ) 
        {
 
       if( inFile.is_open() ) 
        {

-         if (openFileDesc.doVirtualEquilibration) {
+         if (doVirtualEquilibration) {
+           cout << nequileft_internal << endl;
+

            if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
            if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;

-           openFileDesc.doVirtualEquilibration = false;
+           doVirtualEquilibration = false;

            for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;
            for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;


@@ -230,7 +235,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
                nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
                cout << "blabla:" << nequileft_internal << endl;
                readnewconfig = true;
                nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
                cout << "blabla:" << nequileft_internal << endl;
                readnewconfig = true;

-               openFileDesc.firstUsedConfig = false;
+               firstUsedConfig = false;

              }
            }
          }
              }
            }
          }


@@ -239,9 +244,9 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
            {
              memcpy(configMem, tmpConfig, configSize);
              readnewconfig = true;
            {
              memcpy(configMem, tmpConfig, configSize);
              readnewconfig = true;

-             if (openFileDesc.firstUsedConfig) {
-               openFileDesc.firstUsedConfig = false;
-               if (NEQUI < openFileDesc.nequi)
+             if (firstUsedConfig) {
+               firstUsedConfig = false;
+               if (openFileDesc.nequi < NEQUI)

                  nequileft_internal = NEQUI - openFileDesc.nequi - iDidVirtualSkips*openFileDesc.nskip;
                else
                  nequileft_internal = NEQUI - openFileDesc.nequi;
                  nequileft_internal = NEQUI - openFileDesc.nequi - iDidVirtualSkips*openFileDesc.nskip;
                else
                  nequileft_internal = NEQUI - openFileDesc.nequi;


@@ -322,6 +327,7 @@ void configcache::setPara(const string& parid, const double& value){
   inFiles.clear();
 
   refetchDataFiles = true;
   inFiles.clear();
 
   refetchDataFiles = true;

+  nequileft_internal = NEQUI;

 }
 
 configcache::~configcache()
 }
 
 configcache::~configcache()

diff --git a/configcache.h b/configcache.h
index 62db2f309d06fac44c871c65bb6bbe81fa75c497..8146b276c4d33ba7635e261aa48861e35d34f202 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -28,9 +28,7 @@ struct infiledesc {
   string filename;
   int nequi;
   int nskip;
   string filename;
   int nequi;
   int nskip;

-  bool doVirtualEquilibration;

   bool extended;
   bool extended;

-  bool firstUsedConfig;

 };
 
 class configcache{
 };
 
 class configcache{


@@ -109,6 +107,8 @@ class configcache{
   vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
 
   int nequileft_internal;
   vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
 
   int nequileft_internal;

+
+  bool doVirtualEquilibration, firstUsedConfig;

 };
 
 #endif
 };
 
 #endif

diff --git a/hypercache.cpp b/hypercache.cpp
index 0f8d8569c535bb6a92d7c93913e5d5dfbca85116..1648a843cc83ff64e17d26ab0fbf44a70e5353e7 100644 (file)
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -81,7 +81,7 @@ bool hypercache::readC() {
     readAtLeastOneConfig = true;
   }
 
     readAtLeastOneConfig = true;
   }
 

-  if ( nequileft < 0 )
+  if ( nequileft < 0 && readnewconfig_nonex )

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

diff --git a/o815/sim.cpp b/o815/sim.cpp
index 6abf7c61ad028eae88ff736b6ac9ce8733e5a7bb..fe30ec5edd3242f02d71cd4a761cc82bde08f2c4 100644 (file)
--- a/o815/sim.cpp
+++ b/o815/sim.cpp
@@ -13,14 +13,7 @@ o815::sim::sim(o815 *_O815, const int& _confmemSize) {
 }
 
 void o815::sim::nextConfig() {
 }
 
 void o815::sim::nextConfig() {

-  bool readnewconfig;
-  int nequileftReadConfig;
-  bool skippedInEqui = false;
-  bool readNoSingleConfig = true;
-  bool createdNoNewConfigs = true;
-  bool readAtLeastOneConfig;
-
-  readAtLeastOneConfig = hypercache::readC();
+  bool readAtLeastOneConfig = hypercache::readC();

 
   /* equilibrate if necessary */
   if (hypercache::getNEquiLeft() > 0) {
 
   /* equilibrate if necessary */
   if (hypercache::getNEquiLeft() > 0) {


@@ -32,21 +25,14 @@ void o815::sim::nextConfig() {
       _makeSweep();
       while( equiProg.madeStep(iequi) ) *log << "SIM: " << equiProg.done()*100 << "% of equilibration done." << endl << flush;
     }
       _makeSweep();
       while( equiProg.madeStep(iequi) ) *log << "SIM: " << equiProg.done()*100 << "% of equilibration done." << endl << flush;
     }

-    skippedInEqui = true;
-    createdNoNewConfigs = false;

   }
 
   }
 

-  /* make skip if no config could be read */
-  if ( (! readAtLeastOneConfig) ) {
+  /* make skip if no config could be read or one skip is left after equilibration */
+  if ( (! readAtLeastOneConfig) || (hypercache::getNEquiLeft() == 0) ) {

     cout << "SKIPPING" << endl;
     for (int iskip=0; iskip<nskip; iskip++) {
       _makeSweep();
     }
     cout << "SKIPPING" << endl;
     for (int iskip=0; iskip<nskip; iskip++) {
       _makeSweep();
     }

-    createdNoNewConfigs = false;
-  }
- 
-  if (! createdNoNewConfigs) {
-    cout << "::" << hypercache::getNEquiLeft() << endl;

     hypercache::writeC();
   }
 
     hypercache::writeC();
   }