X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/36bc55ceb7b62569c7604f28b3e53bc2e42cf0ce..6ad2fe3a6550b77888c46b17f81d8ab74406649d:/hypercache.cpp?ds=sidebyside

diff --git a/hypercache.cpp b/hypercache.cpp
index 7b3f470..1648a84 100644
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -7,6 +7,9 @@ string hypercache::activeCFile = "";
 vector<unsigned long> hypercache::parentConfigs;
 ostream* hypercache::log;
 vector<configcache*> hypercache::Os;
+int hypercache::NEQUI;
+int hypercache::NSKIP;
+int hypercache::nequileft;
 
 void hypercache::initCache(configcache **cache,
 			   const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
@@ -21,6 +24,9 @@ void hypercache::initCache(configcache **cache,
 
   for (vector<para>::iterator parit=delayedParaSet.begin(); parit != delayedParaSet.end(); ++parit)
     (*cache)->setPara(parit->parid, parit->val);
+
+  NEQUI = nequi;
+  NSKIP = nskip;
 }
 
 void hypercache::addPara(const string& parid, const double& val) {
@@ -47,6 +53,8 @@ void hypercache::setPara(const string& parid, const double& val) {
   
   for (vector<configcache*>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
     (*osit)->setPara(parid, val);
+
+  nequileft = NEQUI;
 }
 
 void hypercache::finalize() {
@@ -60,17 +68,65 @@ string hypercache::fileOfPath(const string& dressedfile) {
   return dressedfile.substr(dressedfile.find_last_of("\\/")+1);
 }
 
-void hypercache::readC(bool& readnewconfig, int& nequileft) {
-  C->readConfig(readnewconfig, nequileft, &parentConfigs);
+bool hypercache::readC() {
+  bool readnewconfig_nonex;
+  int nequileftReadConfig_nonex;
+  bool readAtLeastOneConfig = false;
+
+  C->readConfig(readnewconfig_nonex, nequileftReadConfig_nonex, &parentConfigs);
+
+  if (readnewconfig_nonex) {
+    cout << ":" << nequileftReadConfig_nonex << endl;
+    nequileft = nequileftReadConfig_nonex;
+    readAtLeastOneConfig = true;
+  }
 
-  if ( nequileft < 0 )
+  if ( nequileft < 0 && readnewconfig_nonex )
     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 ) {
+    *log << "HYPERCACHE: Trying to find more equilibrated config in excluded files." << endl << flush;
+
+    char *tmpconfig = (char*) malloc(C->getConfigSize());
+
+    while (true) {
+      bool readnewconfig_ex;
+      int nequileftReadConfig_ex;
+
+      memcpy (tmpconfig, C->getConfigMem(), C->getConfigSize());
+      C->readConfig(readnewconfig_ex, nequileftReadConfig_ex, NULL);
+
+      if (! readnewconfig_ex) {
+	*log << "HYPERCACHE: No more excluded config-files for possible equilibration available." << endl << flush;
+	break;
+      }
+      
+      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;
+      }
+      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);
+  }
+
+  return readAtLeastOneConfig;
 }
 
-void hypercache::writeC(int actnequi) {
-  C->writeConfig(actnequi);
+void hypercache::writeC() {
+  if (nequileft > 0)
+    nequileft = 0;
+
+   nequileft -= NSKIP;
+
+  C->writeConfig(NEQUI-nequileft-NSKIP);
   activeCFile = fileOfPath( C->getOutFileName().substr( 0, C->getOutFileName().length()-4 ) );
 }