...

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index 437294684d559e7d652e768a61087cac0040f752..3dda989c437de8b221c209d5ba70cce7dfef8d53 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -12,6 +12,8 @@
 #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
@@ -23,16 +25,25 @@ struct parameter{
   double val;
 };
 
+struct infiledesc {
+  string filename;
+  int nequi;
+  int nskip;
+  bool doVirtualEquilibration;
+};
+
 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);
+  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();
   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);
   
  private:
+  infiledesc openFileDesc;
   void finishOutFile();
   int getParIndex(const string& parid);
   int NEQUI;
@@ -45,6 +56,8 @@ class configcache{
   ofstream outFile;
   ifstream inFile;
 
+  writeout *out;
+
   stringstream outFileName;
 
   int readnum;
@@ -62,11 +75,13 @@ class configcache{
 
   void fetchDataFiles();
   
-  bool isValidInFile(const string& infile);
+  bool isValidInFile(const string& infile, infiledesc *filedesc);
 
-  vector<string> inFiles;
+  vector<infiledesc> inFiles;
 
   vector<parameter> Paras;
+
+  int readConfigToMem(char *tmpConfig);
 };
 
 #endif