...

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index 3c521d97d1427a3e575fdc270391b8ab405487a6..8146b276c4d33ba7635e261aa48861e35d34f202 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -5,6 +5,7 @@
 #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/filtering_streambuf.hpp>
 #include <boost/iostreams/stream.hpp>


@@ -12,8 +13,6 @@
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/copy.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_DISABLED 0
 #define CACHE_MODE_READ 1
 #define CACHE_MODE_FULL 2


@@ -29,7 +28,6 @@ struct infiledesc {
   string filename;
   int nequi;
   int nskip;
   string filename;
   int nequi;
   int nskip;

-  bool doVirtualEquilibration;

   bool extended;
 };
 
   bool extended;
 };
 


@@ -37,15 +35,23 @@ class configcache{
  public:
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
  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_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 addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);

-  void writeHeader(const string& headerid, 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);
   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:
  private:

+  ostream* log;

   infiledesc openFileDesc;
   void finishOutFile();
   int getParIndex(const string& parid);
   infiledesc openFileDesc;
   void finishOutFile();
   int getParIndex(const string& parid);


@@ -54,13 +60,11 @@ class configcache{
   string DATADIR;
   string CACHEID;
   int MODE;
   string DATADIR;
   string CACHEID;
   int MODE;

-  string getFileId(const bool& shortid=false);
+  string getFileId(int actnequi, const bool& shortid=false);

 
   ofstream outFile;
   ifstream inFile;
 
 
   ofstream outFile;
   ifstream inFile;
 

-  writeout *out;
-

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


@@ -86,7 +90,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();
 


@@ -94,13 +98,17 @@ class configcache{
 
   int readFullBlock(char *tmpData, long unsigned int dataSize);
 
 
   int readFullBlock(char *tmpData, long unsigned int dataSize);
 

-  static unsigned long hash(const string& str);
-

   vector< pair<unsigned long, void *> > headerStore;
 
   void deleteHeaderStore();
 
   bool readAllHeaders();
   vector< pair<unsigned long, void *> > headerStore;
 
   void deleteHeaderStore();
 
   bool readAllHeaders();

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

 };
 
 #endif
 };
 
 #endif