X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/46e492935d31a36641b8e8a5cd27bd86e7df96c4..d09f5f0aeff338a0262c3faf5272b82945a3bf8f:/configcache.h?ds=inline

diff --git a/configcache.h b/configcache.h
index 869fed6..727d1bd 100644
--- a/configcache.h
+++ b/configcache.h
@@ -28,9 +28,7 @@ struct infiledesc {
   string filename;
   int nequi;
   int nskip;
-  bool doVirtualEquilibration;
   bool extended;
-  bool firstConfig;
 };
 
 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);
-  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);
@@ -51,11 +49,12 @@ class configcache{
   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;
-  void finishOutFile();
   int getParIndex(const string& parid);
   int NEQUI;
   int NSKIP;
@@ -109,6 +108,8 @@ class configcache{
   vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
 
   int nequileft_internal;
+
+  bool doVirtualEquilibration, firstUsedConfig;
 };
 
 #endif