Fixed unhashed fileid creation.

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index eaf610a28c7d0f80a489929f77186759b1b302a7..d07aea429252087e1f98d1d44b57d408fdb5c43a 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -5,18 +5,12 @@
 #include <string>
 #include <fstream>
 #include <sstream>
 #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 "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;
 
 
 using namespace std;
 


@@ -29,48 +23,52 @@ struct infiledesc {
   string filename;
   int nequi;
   int nskip;
   string filename;
   int nequi;
   int nskip;

-  bool doVirtualEquilibration;

   bool extended;
   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, 
 };
 
 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_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 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 * 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; }
+  bool isOutFileOpen () { return outFile.is_open(); }
+  void finishOutFile();

 
  private:
 
  private:

+  struct iobuffers;
+  iobuffers *ioBuffers;
+
+  ostream* log;

   infiledesc openFileDesc;
   infiledesc openFileDesc;

-  void finishOutFile();

   int getParIndex(const string& parid);
   int NEQUI;
   int NSKIP;
   string DATADIR;
   string CACHEID;
   int MODE;
   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;
 
 
   ofstream outFile;
   ifstream inFile;
 

-  writeout *out;
-

   stringstream outFileName;
 
   int readnum;
 
   stringstream outFileName;
 
   int readnum;
 

-  boost::iostreams::filtering_istreambuf *inBuffer;
-  boost::iostreams::filtering_ostreambuf *outBuffer;
-

   int inSize;
 
   int configSize;
   int inSize;
 
   int configSize;


@@ -89,7 +87,7 @@ class configcache{
 
   int readDataToMem(char *tmpData, long unsigned int dataSize);
 
 
   int readDataToMem(char *tmpData, long unsigned int dataSize);
 

-  void openOutFile();
+  void openOutFile(int actnequi);

 
   int readHeader();
 
 
   int readHeader();
 


@@ -102,6 +100,14 @@ class configcache{
   void deleteHeaderStore();
 
   bool readAllHeaders();
   void deleteHeaderStore();
 
   bool readAllHeaders();

+
+  vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
+
+  int nequileft_internal;
+
+  bool doVirtualEquilibration, firstUsedConfig;
+
+  string paraString();

 };
 
 #endif
 };
 
 #endif