Made opengl optional and added find_package for boost.

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index 0af533ac694531185aed99c1caa930c8afd2438d..727d1bd325007845bc06bef38b4e0cabcc1a8652 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -28,9 +28,7 @@ struct infiledesc {
   string filename;
   int nequi;
   int nskip;
   string filename;
   int nequi;
   int nskip;

-  bool doVirtualEquilibration;

   bool extended;
   bool extended;

-  int readEquilibratedConfigs;

 };
 
 class configcache{
 };
 
 class configcache{


@@ -38,7 +36,7 @@ class configcache{
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
              const int& cachemode=CACHE_MODE_FULL, ostream *_log=NULL);
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
              const int& cachemode=CACHE_MODE_FULL, ostream *_log=NULL);

-  void readConfig(bool& readnewconfig, int& nequileft, vector<unsigned long> *excludeFileHashes=NULL);
+  void readConfig(bool *readnewconfig, int *nequileft, vector<unsigned long> *excludeFileHashes=NULL);

   void writeConfig(int actnequi);
   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);
   void writeConfig(int actnequi);
   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);


@@ -49,11 +47,14 @@ class configcache{
   static unsigned long hash(const string& str);
   void closeInFile() { inFile.close(); }
   int inFilesLeft() { return inFiles.size(); }
   static unsigned long hash(const string& str);
   void closeInFile() { inFile.close(); }
   int inFilesLeft() { return inFiles.size(); }

+  char* getConfigMem() { return configMem; }
+  int getConfigSize() { return configSize; }
+  bool isOutFileOpen () { return outFile.is_open(); }
+  void finishOutFile();

 
  private:
   ostream* log;
   infiledesc openFileDesc;
 
  private:
   ostream* log;
   infiledesc openFileDesc;

-  void finishOutFile();

   int getParIndex(const string& parid);
   int NEQUI;
   int NSKIP;
   int getParIndex(const string& parid);
   int NEQUI;
   int NSKIP;


@@ -105,6 +106,10 @@ class configcache{
   bool readAllHeaders();
 
   vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
   bool readAllHeaders();
 
   vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);

+
+  int nequileft_internal;
+
+  bool doVirtualEquilibration, firstUsedConfig;

 };
 
 #endif
 };
 
 #endif