Fixed unhashed fileid creation.

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index 158eb0ae85f87cdea8d1ad8f97a985cb54186f15..d07aea429252087e1f98d1d44b57d408fdb5c43a 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -7,9 +7,10 @@
 #include <sstream>
 #include <ostream>
 
-#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;
 
@@ -23,13 +24,14 @@ struct infiledesc {
   int nequi;
   int nskip;
   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, 
-             const int& cachemode=CACHE_MODE_FULL, ostream *_log=NULL);
+             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);
@@ -58,7 +60,7 @@ class configcache{
   string DATADIR;
   string CACHEID;
   int MODE;
-  string getFileId(int actnequi, const bool& shortid=false);
+  string getFileId(int actnequi, const bool& superextended=true, const bool& shortid=false);
 
   ofstream outFile;
   ifstream inFile;
@@ -104,6 +106,8 @@ class configcache{
   int nequileft_internal;
 
   bool doVirtualEquilibration, firstUsedConfig;
+
+  string paraString();
 };
 
 #endif