X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/a477390b3aa6eea3a7d822a0499816eb0e2bf499..a2b065a04a23009d81caab4ce169497b042b352b:/hypercache.cpp

diff --git a/hypercache.cpp b/hypercache.cpp
index b2a0b25..e6864ac 100644
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -6,7 +6,7 @@ vector<hypercache::para> hypercache::delayedParaSet;
 string hypercache::activeCFile = "";
 vector<unsigned long> hypercache::parentConfigs;
 ostream* hypercache::log;
-vector<configcache*> hypercache::Os;
+vector<hypercache::observable> hypercache::Os;
 int hypercache::NEQUI;
 int hypercache::NSKIP;
 int hypercache::nequileft;
@@ -39,8 +39,8 @@ void hypercache::addPara(const string& parid, const double& val) {
   if (C != NULL)
     C->addPara(parid, val);
 
-  for (vector<configcache*>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
-    (*osit)->addPara(parid, val);
+  for (vector<observable>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
+    osit->c->addPara(parid, val);
 }
 
 void hypercache::setPara(const string& parid, const double& val) {
@@ -52,16 +52,16 @@ void hypercache::setPara(const string& parid, const double& val) {
   if (C != NULL)
     C->setPara(parid, val);
   
-  for (vector<configcache*>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
-    (*osit)->setPara(parid, val);
+  for (vector<observable>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
+    osit->c->setPara(parid, val);
 
   nequileft = NEQUI;
   mostEquilibratedConfig.first = NEQUI;
 }
 
 void hypercache::finalize() {
-  for (vector<configcache*>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
-    delete *osit;
+  for (vector<observable>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
+    delete osit->c;
   
   delete C;
 }
@@ -71,24 +71,18 @@ string hypercache::fileOfPath(const string& dressedfile) {
 }
 
 bool hypercache::readC() {
-  bool readnewconfig_nonex;
-  int nequileftReadConfig_nonex;
-  bool readAtLeastOneConfig = false;
+  bool readAtLeastOneConfig;
 
-  C->readConfig(readnewconfig_nonex, nequileftReadConfig_nonex, &parentConfigs);
+  C->readConfig(&readAtLeastOneConfig, &nequileft, &parentConfigs);
 
-  if (readnewconfig_nonex) {
-    nequileft = nequileftReadConfig_nonex;
-    readAtLeastOneConfig = true;
-  }
-
-  if ( nequileft < 0 && readnewconfig_nonex )
+  if ( nequileft < 0 && readAtLeastOneConfig )
     activeCFile = fileOfPath(C->getInFileName());
   else
     activeCFile = "";
 
   /* try to find more equilibrated config-file configuration for equilibration in excluded files */
-  if ( nequileft > 0 && C->inFilesLeft() > 0 ) {
+  if ( ( nequileft >= 0 || ( ! readAtLeastOneConfig ) ) && C->inFilesLeft() > 0 ) {
+    int nEquiLeftBeforeExcludedFileCheck = nequileft;
     *log << "HYPERCACHE: Trying to find more equilibrated config in excluded files." << endl << flush;
 
     char *tmpconfig = (char*) malloc(C->getConfigSize());
@@ -98,7 +92,7 @@ bool hypercache::readC() {
       int nequileftReadConfig_ex;
 
       memcpy (tmpconfig, C->getConfigMem(), C->getConfigSize());
-      C->readConfig(readnewconfig_ex, nequileftReadConfig_ex, NULL);
+      C->readConfig(&readnewconfig_ex, &nequileftReadConfig_ex, NULL);
 
       if (! readnewconfig_ex) {
 	*log << "HYPERCACHE: No more excluded config-files for possible equilibration available." << endl << flush;
@@ -106,32 +100,32 @@ bool hypercache::readC() {
       }
       
       if (nequileftReadConfig_ex <= nequileft) {
-	*log << "HYPERCACHE: Found more equilibrated or same equilibrated excluded config-file configuration for equilibration." << endl << flush;
 	nequileft = nequileftReadConfig_ex;
-	readAtLeastOneConfig = true;
+	readAtLeastOneConfig = false;
       }
       else if (nequileftReadConfig_ex > nequileft) {
-	*log << "HYPERCACHE: Excluded config-file configuration for equilibration is less equilibrated than actual config." << endl << flush;
 	memcpy (C->getConfigMem(), tmpconfig, C->getConfigSize());
       }
     }
     free(tmpconfig);
+
+    if (nEquiLeftBeforeExcludedFileCheck > nequileft)
+      *log << "HYPERCACHE: Found more equilibrated or same equilibrated excluded config-file configuration for equilibration." << endl << flush;
+    else
+      *log << "HYPERCACHE: Excluded config-file configuration for equilibration is less equilibrated than actual config." << endl << flush;
   }
 
   /* storing most equilibrated config */
   if ( nequileft < mostEquilibratedConfig.first && readAtLeastOneConfig ) {
-    *log << "HYPERCACHE: Storing a copy of so far most equilibrated config with nequileft = " << nequileft << endl << flush;
     mostEquilibratedConfig.first = nequileft;
     memcpy(mostEquilibratedConfig.second, C->getConfigMem(), C->getConfigSize());
   }
 
-  
   /* injecting back most equilibrated config if nothing could be used anymore */
-  if ( nequileft > 0 && mostEquilibratedConfig.first < nequileft ) {
+  if ( (!readAtLeastOneConfig) && mostEquilibratedConfig.first < nequileft ) {
     *log << "HYPERCACHE: Injecting back most equilibrated stored config with nequileft = " << mostEquilibratedConfig.first << endl << flush;
     nequileft = mostEquilibratedConfig.first;
     memcpy(C->getConfigMem(), mostEquilibratedConfig.second, C->getConfigSize());
-    readAtLeastOneConfig = false;
   }
 
   return readAtLeastOneConfig;
@@ -147,19 +141,24 @@ void hypercache::writeC() {
   activeCFile = fileOfPath( C->getOutFileName().substr( 0, C->getOutFileName().length()-4 ) );
 }
 
-void hypercache::writeO(int obsid, int actnequi) {
+void hypercache::writeO(int obsid) {
+  if ( ( Os[obsid].lastWrittenObsEquis + NSKIP != NEQUI-nequileft-NSKIP ) && Os[obsid].c->isOutFileOpen() )
+    Os[obsid].c->finishOutFile();
+
   if ( activeCFile != "" ) {
     unsigned long afilehash = configcache::hash(activeCFile);
-    Os[obsid]->writeHeader("concurrent_cfile", (char*)(&afilehash), sizeof(unsigned long), actnequi);
+    Os[obsid].c->writeHeader("concurrent_cfile", (char*)(&afilehash), sizeof(unsigned long), NEQUI-nequileft-NSKIP);
   }
-  Os[obsid]->writeConfig(actnequi); 
+  Os[obsid].c->writeConfig(NEQUI-nequileft-NSKIP); 
+
+  Os[obsid].lastWrittenObsEquis = NEQUI-nequileft-NSKIP;
 }
 
-void hypercache::readO(int obsid, bool& readnewconfig, int& nequileft) {
-  Os[obsid]->readConfig(readnewconfig, nequileft);
+void hypercache::readO(int obsid, bool *readNewObsConfig, int *nequiObsLeft) {
+  Os[obsid].c->readConfig(readNewObsConfig, nequiObsLeft);
 
-  if ( nequileft < 0 ) {
-    unsigned long *parentconfig = (unsigned long*)Os[obsid]->getHeader("concurrent_cfile");
+  if ( *readNewObsConfig && *nequiObsLeft < 0 ) {
+    unsigned long *parentconfig = (unsigned long*)Os[obsid].c->getHeader("concurrent_cfile");
     if ( parentconfig != NULL )
       addParentConfig(parentconfig);
   }