X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/3c0ea1a85b09df3bb85839ba92831fca9e10a82f..e34773ccb43eefc86dc814b768af85da2873e5ef:/configcache.h?ds=inline

diff --git a/configcache.h b/configcache.h
index 727d1bd..d07aea4 100644
--- a/configcache.h
+++ b/configcache.h
@@ -7,15 +7,10 @@
 #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>
-
-#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,13 +24,14 @@ 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);
+	      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);
@@ -53,6 +49,9 @@ class configcache{
   void finishOutFile();
 
  private:
+  struct iobuffers;
+  iobuffers *ioBuffers;
+
   ostream* log;
   infiledesc openFileDesc;
   int getParIndex(const string& parid);
@@ -61,7 +60,7 @@ class configcache{
   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;
@@ -70,9 +69,6 @@ class configcache{
 
   int readnum;
 
-  boost::iostreams::filtering_istreambuf *inBuffer;
-  boost::iostreams::filtering_ostreambuf *outBuffer;
-
   int inSize;
 
   int configSize;
@@ -110,6 +106,8 @@ class configcache{
   int nequileft_internal;
 
   bool doVirtualEquilibration, firstUsedConfig;
+
+  string paraString();
 };
 
 #endif