From: Alex Schmidt <alex@treefish.org>
Date: Tue, 18 Jun 2013 19:19:13 +0000 (+0200)
Subject: ...
X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/commitdiff_plain/dde851eb3186dbb51898dfe8fc530fce1e0a4cd3

...
---

diff --git a/configcache.cpp b/configcache.cpp
index 35e8548..f642e9f 100644
--- 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->firstConfig = true;
+  filedesc->firstUsedConfig = true;
 
   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);
+      int iDidVirtualSkips;
 
       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;
-	    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;
-	      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;
+		nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
 		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 (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;
diff --git a/configcache.h b/configcache.h
index 869fed6..62db2f3 100644
--- a/configcache.h
+++ b/configcache.h
@@ -30,7 +30,7 @@ struct infiledesc {
   int nskip;
   bool doVirtualEquilibration;
   bool extended;
-  bool firstConfig;
+  bool firstUsedConfig;
 };
 
 class configcache{