X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/a55a5830c5c98e950d58593697dd4ee5e4384716..8d11db1cf57b103fcec701d71c9d620b1c381b73:/configcache.h

diff --git a/configcache.h b/configcache.h
index 4aa245e..74998c7 100644
--- a/configcache.h
+++ b/configcache.h
@@ -5,18 +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"
 
-#include "writeout.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;
 
@@ -29,45 +25,51 @@ struct infiledesc {
   string filename;
   int nequi;
   int nskip;
-  bool doVirtualEquilibration;
   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, writeout *out_a=NULL);
-  bool readConfig();
-  void writeConfig();
+	      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);
-  void writeHeader(char *header, long unsigned int size);
-  void *getHeader();
-  
+  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;
-  void finishOutFile();
   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;
-
-  writeout *out;
 
   stringstream outFileName;
 
   int readnum;
 
-  boost::iostreams::filtering_istreambuf *inBuffer;
-  boost::iostreams::filtering_ostreambuf *outBuffer;
-
   int inSize;
 
   int configSize;
@@ -84,17 +86,23 @@ class configcache{
 
   vector<parameter> Paras;
 
-  int readDataToMem(char *tmpData, long unsigned int dataSize);
+  void openOutFile(int actnequi);
 
-  void openOutFile();
+  int readHeader();
 
-  char *readHeaderData;
+  bool headerWritten;
 
-  bool readHeader();
+  bool readAllHeaders();
 
-  bool headerWritten;
+  vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
+
+  int nequileft_internal;
+
+  bool doVirtualEquilibration, firstUsedConfig;
+
+  string paraString();
 
-  int readFullBlock(char *tmpData, long unsigned int dataSize);
+  datread *dataReader;
 };
 
 #endif