X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/dde851eb3186dbb51898dfe8fc530fce1e0a4cd3..598fe7b7a358769fc1b6c48772f35cf7b719e8b4:/configcache.cpp?ds=sidebyside

diff --git a/configcache.cpp b/configcache.cpp
index f642e9f..62519a4 100644
--- 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->firstUsedConfig = 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: 
@@ -178,11 +174,9 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
-/* returns number of equilibration-steps left with new read configuration 
-   or zero if no new configuration was read */
-void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigned long> *excludeFileHashes)
+void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigned long> *excludeFileHashes)
 {
-  readnewconfig = false;
+  *readnewconfig = false;
 
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
 
@@ -197,14 +191,21 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
       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 );
 	
@@ -219,18 +220,17 @@ 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;
+	    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) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) {
 		memcpy(configMem, tmpConfig, configSize);
 		nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
-		cout << "blabla:" << nequileft_internal << endl;
-		readnewconfig = true;
-		openFileDesc.firstUsedConfig = false;
+		*readnewconfig = true;
+		firstUsedConfig = false;
 	      }
 	    }
 	  }
@@ -238,17 +238,16 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 	  if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
 	    {
 	      memcpy(configMem, tmpConfig, configSize);
-	      readnewconfig = true;
-	      if (openFileDesc.firstUsedConfig) {
-		openFileDesc.firstUsedConfig = false;
-		if (NEQUI < openFileDesc.nequi)
+	      *readnewconfig = true;
+	      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;
+	      *nequileft = nequileft_internal;
 	      return;
 	    }
 	  else {
@@ -322,6 +321,7 @@ void configcache::setPara(const string& parid, const double& value){
   inFiles.clear();
 
   refetchDataFiles = true;
+  nequileft_internal = NEQUI;
 }
 
 configcache::~configcache()