X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/dde851eb3186dbb51898dfe8fc530fce1e0a4cd3..adc28159abd921fc4cbdd942af8c149ba6800f2a:/configcache.h diff --git a/configcache.h b/configcache.h index 62db2f3..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 firstUsedConfig; }; 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 *excludeFileHashes=NULL); + void readConfig(bool *readnewconfig, int *nequileft, vector *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::iterator getNextInfile(vector *excludeFileHashes); int nequileft_internal; + + bool doVirtualEquilibration, firstUsedConfig; }; #endif