minor changes to test.

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 35e85488d34e1a315301a283ad310e77df8a54b7..0cabc9d5e7e677b4c06487bba398098581330393 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;
-  filedesc->doVirtualEquilibration = false;
-  filedesc->firstConfig = true;
 
   if( infile.size() < 4 ) return false;
 
@@ -98,8 +96,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
            return false;
          break;
        case 2:
-         if (atoi(inParts) < NEQUI)
-           filedesc->doVirtualEquilibration = true;
          filedesc->nequi = atoi(inParts);
          break;
        case 3: 
@@ -194,16 +190,24 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
   while(true)
     {
       vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);
+      int iDidVirtualSkips;
 
       if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
-       cout << "RETURNING..." << endl;
-       nequileft = nequileft_internal;
+       if (readnewconfig)
+         nequileft = nequileft_internal;
        return;
       }
 
       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 );
        
@@ -218,32 +222,33 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 
       if( inFile.is_open() ) 
        {
-         if (openFileDesc.doVirtualEquilibration) {
+         if (doVirtualEquilibration) {
            if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
-           openFileDesc.doVirtualEquilibration = false;
-           for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
+           doVirtualEquilibration = false;
+           for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;
-             else if ( (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip < nequileft_internal ) {
+             else if ( (NEQUI-openFileDesc.nequi) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) {
                memcpy(configMem, tmpConfig, configSize);
-               nequileft_internal = NEQUI - openFileDesc.nequi - (iskip+1)*openFileDesc.nskip;
-               cout << "blabla:" << nequileft_internal << endl;
+               nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
                readnewconfig = true;
+               firstUsedConfig = false;
              }
            }
-           openFileDesc.firstConfig = false;
          }
 
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);
              readnewconfig = true;
-             if (openFileDesc.firstConfig) {
-               openFileDesc.firstConfig = false;
-               nequileft_internal = 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 -= openFileDesc.nskip;
-             cout << "sadasd:" << nequileft_internal << endl;
              nequileft = nequileft_internal;
              return;
            }
@@ -318,6 +323,7 @@ void configcache::setPara(const string& parid, const double& value){
   inFiles.clear();
 
   refetchDataFiles = true;
+  nequileft_internal = NEQUI;
 }
 
 configcache::~configcache()