...

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 35e85488d34e1a315301a283ad310e77df8a54b7..f642e9f26fc99e2e4f8a685d9673738a56c8e2ea 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -73,7 +73,7 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
   filedesc->filename = infile;
   filedesc->doVirtualEquilibration = false;
 
   filedesc->filename = infile;
   filedesc->doVirtualEquilibration = false;

-  filedesc->firstConfig = true;
+  filedesc->firstUsedConfig = true;

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


@@ -194,6 +194,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
   while(true)
     {
       vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);
   while(true)
     {
       vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);

+      int iDidVirtualSkips;

 
       if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
        cout << "RETURNING..." << endl;
 
       if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
        cout << "RETURNING..." << endl;


@@ -221,26 +222,29 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
          if (openFileDesc.doVirtualEquilibration) {
            if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
            openFileDesc.doVirtualEquilibration = false;
          if (openFileDesc.doVirtualEquilibration) {
            if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
            openFileDesc.doVirtualEquilibration = false;

-           for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
+           for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {

              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;
              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);
                memcpy(configMem, tmpConfig, configSize);

-               nequileft_internal = NEQUI - openFileDesc.nequi - (iskip+1)*openFileDesc.nskip;
+               nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;

                cout << "blabla:" << nequileft_internal << endl;
                readnewconfig = true;
                cout << "blabla:" << nequileft_internal << endl;
                readnewconfig = true;

+               openFileDesc.firstUsedConfig = false;

              }
            }
              }
            }

-           openFileDesc.firstConfig = false;

          }
 
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);
              readnewconfig = true;
          }
 
          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 (openFileDesc.firstUsedConfig) {
+               openFileDesc.firstUsedConfig = false;
+               if (NEQUI < openFileDesc.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_internal -= openFileDesc.nskip;
              cout << "sadasd:" << nequileft_internal << endl;