X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/b80a3fda9209144605a6306ba24ec2051d387f50..dde851eb3186dbb51898dfe8fc530fce1e0a4cd3:/configcache.h?ds=sidebyside

diff --git a/configcache.h b/configcache.h
index eaf610a..62db2f3 100644
--- a/configcache.h
+++ b/configcache.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <fstream>
 #include <sstream>
+#include <ostream>
 
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/stream.hpp>
@@ -12,8 +13,6 @@
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/copy.hpp>
 
-#include "writeout.h"
-
 #define CACHE_MODE_DISABLED 0
 #define CACHE_MODE_READ 1
 #define CACHE_MODE_FULL 2
@@ -31,24 +30,30 @@ struct infiledesc {
   int nskip;
   bool doVirtualEquilibration;
   bool extended;
+  bool firstUsedConfig;
 };
 
 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(vector<string> *excludefiles=NULL);
-  void writeConfig();
+	      const int& cachemode=CACHE_MODE_FULL, 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(const string& headerid, const char *header, long unsigned int size);
+  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() { inFile.close(); }
+  int inFilesLeft() { return inFiles.size(); }
+  char* getConfigMem() { return configMem; }
+  int getConfigSize() { return configSize; }
 
  private:
+  ostream* log;
   infiledesc openFileDesc;
   void finishOutFile();
   int getParIndex(const string& parid);
@@ -57,13 +62,11 @@ class configcache{
   string DATADIR;
   string CACHEID;
   int MODE;
-  string getFileId(const bool& shortid=false);
+  string getFileId(int actnequi, const bool& shortid=false);
 
   ofstream outFile;
   ifstream inFile;
 
-  writeout *out;
-
   stringstream outFileName;
 
   int readnum;
@@ -89,7 +92,7 @@ class configcache{
 
   int readDataToMem(char *tmpData, long unsigned int dataSize);
 
-  void openOutFile();
+  void openOutFile(int actnequi);
 
   int readHeader();
 
@@ -102,6 +105,10 @@ class configcache{
   void deleteHeaderStore();
 
   bool readAllHeaders();
+
+  vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
+
+  int nequileft_internal;
 };
 
 #endif