...

[phys/latlib.git] / hypercache.cpp

diff --git a/hypercache.cpp b/hypercache.cpp
index 03a20f8f518519e1aaf08108a3a9f3b36cfa57e9..0f8d8569c535bb6a92d7c93913e5d5dfbca85116 100644 (file)
--- 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,50 +68,84 @@ string hypercache::fileOfPath(const string& dressedfile) {
   return dressedfile.substr(dressedfile.find_last_of("\\/")+1);
 }
 
-int hypercache::readC() { 
-  int readret;
+bool hypercache::readC() {
+  bool readnewconfig_nonex;
+  int nequileftReadConfig_nonex;
+  bool readAtLeastOneConfig = false;
 
-  readret = C->readConfig(&parentConfigs);
+  C->readConfig(readnewconfig_nonex, nequileftReadConfig_nonex, &parentConfigs);
 
-  if ( readret == -1 )
+  if (readnewconfig_nonex) {
+    cout << ":" << nequileftReadConfig_nonex << endl;
+    nequileft = nequileftReadConfig_nonex;
+    readAtLeastOneConfig = true;
+  }
+
+  if ( nequileft < 0 )
     activeCFile = fileOfPath(C->getInFileName());
   else
     activeCFile = "";
 
-  return readret; 
-}
+  /* 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);
+  }
 
-int hypercache::read1CForEqui() {
-  int readret = C->readConfig(NULL);
-  C->closeInFile();
-  return readret;
+  return readAtLeastOneConfig;
 }
 
 void hypercache::writeC() {
-  C->writeConfig();
+  if (nequileft > 0)
+    nequileft = 0;
+
+   nequileft -= NSKIP;
+
+  C->writeConfig(NEQUI-nequileft-NSKIP);
   activeCFile = fileOfPath( C->getOutFileName().substr( 0, C->getOutFileName().length()-4 ) );
 }
 
-void hypercache::writeO(int obsid) {
+void hypercache::writeO(int obsid, int actnequi) {
   if ( activeCFile != "" ) {
     unsigned long afilehash = configcache::hash(activeCFile);
-    Os[obsid]->writeHeader("concurrent_cfile", (char*)(&afilehash), sizeof(unsigned long));
+    Os[obsid]->writeHeader("concurrent_cfile", (char*)(&afilehash), sizeof(unsigned long), actnequi);
   }
-  Os[obsid]->writeConfig(); 
+  Os[obsid]->writeConfig(actnequi); 
 }
 
-int hypercache::readO(int obsid) {
-  int readret;
+void hypercache::readO(int obsid, bool& readnewconfig, int& nequileft) {
+  Os[obsid]->readConfig(readnewconfig, nequileft);
 
-  readret = Os[obsid]->readConfig();
-
-  if ( readret == -1 ) {
+  if ( nequileft < 0 ) {
     unsigned long *parentconfig = (unsigned long*)Os[obsid]->getHeader("concurrent_cfile");
     if ( parentconfig != NULL )
       addParentConfig(parentconfig);
   }
-  
-  return readret;
 }
 
 void hypercache::addParentConfig(const unsigned long *parentconfig) {