Made opengl optional and added find_package for boost.

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 168de5e14494c122e8a262bd3176c223635a76fe..ef085d8cb25815d78d02ccbfc258ee4332b5f6d6 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -72,8 +72,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
   string truncIn, truncOut;
 
   filedesc->filename = infile;
   string truncIn, truncOut;
 
   filedesc->filename = infile;

-  filedesc->doVirtualEquilibration = false;
-  filedesc->readEquilibratedConfigs = 0;

 
   if( infile.size() < 4 ) return false;
 
 
   if( infile.size() < 4 ) return false;
 


@@ -98,8 +96,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
            return false;
          break;
        case 2:
            return false;
          break;
        case 2:

-         if (atoi(inParts) < NEQUI)
-           filedesc->doVirtualEquilibration = true;

          filedesc->nequi = atoi(inParts);
          break;
        case 3: 
          filedesc->nequi = atoi(inParts);
          break;
        case 3: 


@@ -178,12 +174,9 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
   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;
-  nequileft = NEQUI;
+  *readnewconfig = false;

 
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
 
 
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
 


@@ -195,12 +188,24 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
   while(true)
     {
       vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);
   while(true)
     {
       vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);

+      int iDidVirtualSkips;

 
 

-      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) return;
+      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
+       if (*readnewconfig)
+         *nequileft = nequileft_internal;
+       return;
+      }

 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
        openFileDesc = *inFileIt;
 
 
       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 );
        
        if(log) *log << "CCACHE: Opening dat-file: " << inFileIt->filename << endl << flush;
        inFile.open( (DATADIR + "/" + inFileIt->filename).c_str(), std::ios::binary );
        


@@ -215,16 +220,17 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 
       if( inFile.is_open() ) 
        {
 
       if( inFile.is_open() ) 
        {

-         if (openFileDesc.doVirtualEquilibration) {
+         if (doVirtualEquilibration) {

            if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
            if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;

-           openFileDesc.doVirtualEquilibration = false;
-           for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
+           doVirtualEquilibration = false;
+           for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {

              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;

-             else if ( (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip < nequileft ) {
+             else if ( (NEQUI-openFileDesc.nequi) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) {

                memcpy(configMem, tmpConfig, configSize);
                memcpy(configMem, tmpConfig, configSize);

-               nequileft = (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip;
-               readnewconfig = true;
+               nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
+               *readnewconfig = true;
+               firstUsedConfig = false;

              }
            }
          }
              }
            }
          }


@@ -232,9 +238,16 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);

-             readnewconfig = true;
-             nequileft = NEQUI - openFileDesc.nequi - openFileDesc.readEquilibratedConfigs*openFileDesc.nskip;
-             openFileDesc.readEquilibratedConfigs++;
+             *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;
+             *nequileft = nequileft_internal;

              return;
            }
          else {
              return;
            }
          else {


@@ -246,7 +259,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 }
 
 void configcache::openOutFile(int actnequi)
 }
 
 void configcache::openOutFile(int actnequi)

-{
+{ 

   time_t secstamp = time(NULL);
 
   outFileName.str("");
   time_t secstamp = time(NULL);
 
   outFileName.str("");


@@ -302,12 +315,14 @@ int configcache::getParIndex(const string& parid){
 
 void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;
 
 void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;

+

   finishOutFile();
   if(inBuffer != NULL) { delete inBuffer; inBuffer=NULL; } 
   inFile.close();
   inFiles.clear();
 
   refetchDataFiles = true;
   finishOutFile();
   if(inBuffer != NULL) { delete inBuffer; inBuffer=NULL; } 
   inFile.close();
   inFiles.clear();
 
   refetchDataFiles = true;

+  nequileft_internal = NEQUI;

 }
 
 configcache::~configcache()
 }
 
 configcache::~configcache()