X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/027b93b16fe0d77104e0e711377c5728b0934035..c819c7a5996c18a6b1c5501c1984245840ddc8ca:/configcache.h

diff --git a/configcache.h b/configcache.h
index 4372946..74998c7 100644
--- a/configcache.h
+++ b/configcache.h
@@ -5,16 +5,14 @@
 #include <string>
 #include <fstream>
 #include <sstream>
+#include <ostream>
 
-#include <boost/iostreams/filtering_streambuf.hpp>
-#include <boost/iostreams/stream.hpp>
-#include <boost/iostreams/filter/bzip2.hpp>
-#include <boost/iostreams/device/array.hpp>
-#include <boost/iostreams/copy.hpp>
+#include "datread.h"
 
-#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;
 
@@ -23,35 +21,55 @@ struct parameter{
   double val;
 };
 
+struct infiledesc {
+  string filename;
+  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);
-  bool readConfig();
-  void writeConfig();
+  configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
+	      const int& cachemode=CACHE_MODE_RW, ostream *_log=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);
-  
- private:
+  void writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi);
+  void * getHeader(const string& headerid);
+  string getOutFileName() { return outFileName.str(); }
+  string getInFileName() { return DATADIR + "/" + openFileDesc.filename; }
+  static unsigned long hash(const string& str);
+  void closeInFile() { dataReader->closeFile(); }
+  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;
   int getParIndex(const string& parid);
   int NEQUI;
   int NSKIP;
   string DATADIR;
   string CACHEID;
   int MODE;
-  string getFileId(const bool& shortid=false);
+  string getFileId(int actnequi, const bool& superextended=true, const bool& shortid=false);
 
   ofstream outFile;
-  ifstream inFile;
 
   stringstream outFileName;
 
   int readnum;
 
-  boost::iostreams::filtering_istreambuf *inBuffer;
-  boost::iostreams::filtering_ostreambuf *outBuffer;
-
   int inSize;
 
   int configSize;
@@ -62,11 +80,29 @@ class configcache{
 
   void fetchDataFiles();
   
-  bool isValidInFile(const string& infile);
+  bool isValidInFile(const string& infile, infiledesc *filedesc);
 
-  vector<string> inFiles;
+  vector<infiledesc> inFiles;
 
   vector<parameter> Paras;
+
+  void openOutFile(int actnequi);
+
+  int readHeader();
+
+  bool headerWritten;
+
+  bool readAllHeaders();
+
+  vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
+
+  int nequileft_internal;
+
+  bool doVirtualEquilibration, firstUsedConfig;
+
+  string paraString();
+
+  datread *dataReader;
 };
 
 #endif