X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/6ad2fe3a6550b77888c46b17f81d8ab74406649d..e34773ccb43eefc86dc814b768af85da2873e5ef:/configcache.h?ds=inline diff --git a/configcache.h b/configcache.h index 8146b27..d07aea4 100644 --- a/configcache.h +++ b/configcache.h @@ -7,15 +7,10 @@ #include #include -#include -#include -#include -#include -#include - -#define CACHE_MODE_DISABLED 0 -#define CACHE_MODE_READ 1 -#define CACHE_MODE_FULL 2 +#define CACHE_MODE_OO 0 +#define CACHE_MODE_RO 1 +#define CACHE_MODE_WO 2 +#define CACHE_MODE_RW 3 using namespace std; @@ -29,14 +24,15 @@ struct infiledesc { int nequi; int nskip; bool extended; + bool superextended; }; class configcache{ public: ~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); + const int& cachemode=CACHE_MODE_RW, ostream *_log=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); @@ -49,18 +45,22 @@ class configcache{ int inFilesLeft() { return inFiles.size(); } char* getConfigMem() { return configMem; } int getConfigSize() { return configSize; } + bool isOutFileOpen () { return outFile.is_open(); } + void finishOutFile(); private: + struct iobuffers; + iobuffers *ioBuffers; + ostream* log; infiledesc openFileDesc; - void finishOutFile(); int getParIndex(const string& parid); int NEQUI; int NSKIP; string DATADIR; string CACHEID; int MODE; - string getFileId(int actnequi, const bool& shortid=false); + string getFileId(int actnequi, const bool& superextended=true, const bool& shortid=false); ofstream outFile; ifstream inFile; @@ -69,9 +69,6 @@ class configcache{ int readnum; - boost::iostreams::filtering_istreambuf *inBuffer; - boost::iostreams::filtering_ostreambuf *outBuffer; - int inSize; int configSize; @@ -109,6 +106,8 @@ class configcache{ int nequileft_internal; bool doVirtualEquilibration, firstUsedConfig; + + string paraString(); }; #endif