X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/36bc55ceb7b62569c7604f28b3e53bc2e42cf0ce..7d78a412f4cde48ce35f8f4cbe77c2a333484fa8:/configcache.h?ds=inline

diff --git a/configcache.h b/configcache.h
index 0af533a..158eb0a 100644
--- a/configcache.h
+++ b/configcache.h
@@ -7,12 +7,6 @@
 #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
@@ -28,9 +22,7 @@ struct infiledesc {
   string filename;
   int nequi;
   int nskip;
-  bool doVirtualEquilibration;
   bool extended;
-  int readEquilibratedConfigs;
 };
 
 class configcache{
@@ -38,7 +30,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<unsigned long> *excludeFileHashes=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);
@@ -49,11 +41,17 @@ class configcache{
   static unsigned long hash(const string& str);
   void closeInFile() { inFile.close(); }
   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;
@@ -69,9 +67,6 @@ class configcache{
 
   int readnum;
 
-  boost::iostreams::filtering_istreambuf *inBuffer;
-  boost::iostreams::filtering_ostreambuf *outBuffer;
-
   int inSize;
 
   int configSize;
@@ -105,6 +100,10 @@ class configcache{
   bool readAllHeaders();
 
   vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
+
+  int nequileft_internal;
+
+  bool doVirtualEquilibration, firstUsedConfig;
 };
 
 #endif