Changed hashed parastring cachfilename postfix to sdat and made configcache backward...

[phys/latlib.git] / hypercache.h

diff --git a/hypercache.h b/hypercache.h
index efb97fa686bd6cdbd8d5205a702df682b9437faa..199b7e731d0dca88fbc417f0cf4c643d68aa03e3 100644 (file)
--- a/hypercache.h
+++ b/hypercache.h
@@ -10,14 +10,24 @@ using namespace std;
 
 class hypercache {
  public:
 
 class hypercache {
  public:

+  struct observable{
+    configcache *c;
+    int lastWrittenObsEquis;
+  };
+

   static int initO(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
   static int initO(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) {
-    Os.push_back(NULL);
-    initCache(&Os.back(), cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, _log);
+                  char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_RW, ostream *_log=NULL) {
+    observable newobs;
+    
+    newobs.c = NULL;
+    newobs.lastWrittenObsEquis = 0;
+    Os.push_back(newobs);
+
+    initCache(&Os.back().c, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, _log);

     return Os.size()-1;
   }
   static void initC(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
     return Os.size()-1;
   }
   static void initC(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) {
+                   char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_RW, ostream *_log=NULL) {

     initCache(&C, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, _log);
     mostEquilibratedConfig.second = new char[configMemSize];
   }
     initCache(&C, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, _log);
     mostEquilibratedConfig.second = new char[configMemSize];
   }


@@ -26,12 +36,12 @@ class hypercache {
   
   static void addPara(const string& parid, const double& val=0);
   static void setPara(const string& parid, const double& value);
   
   static void addPara(const string& parid, const double& val=0);
   static void setPara(const string& parid, const double& value);

-  static void readO(int obsid, bool& readnewconfig, int& nequileft);
+  static void readO(int obsid, bool *readNewObsConfig, int *nequiObsLeft);

   static bool readC();
   static void writeO(int obsid);
   static void writeC();
   static bool readC();
   static void writeO(int obsid);
   static void writeC();

-  static void writeHeaderO(int obsid, const string& headerid, char *header, long unsigned int size, int actnequi) { Os[obsid]->writeHeader(headerid, header, size, actnequi); }
-  static void *getHeaderO(int obsid, const string& headerid) { Os[obsid]->getHeader(headerid); }
+  static void writeHeaderO(int obsid, const string& headerid, char *header, long unsigned int size, int actnequi) { Os[obsid].c->writeHeader(headerid, header, size, actnequi); }
+  static void *getHeaderO(int obsid, const string& headerid) { Os[obsid].c->getHeader(headerid); }

   static void writeHeaderC(const string& headerid, char *header, long unsigned int size, int actnequi) { C->writeHeader(headerid, header, size, actnequi); }
   static void *getHeaderC(const string& headerid) { C->getHeader(headerid); }
 
   static void writeHeaderC(const string& headerid, char *header, long unsigned int size, int actnequi) { C->writeHeader(headerid, header, size, actnequi); }
   static void *getHeaderC(const string& headerid) { C->getHeader(headerid); }
 


@@ -47,13 +57,13 @@ class hypercache {
 
   static void initCache(configcache **cache,
                        const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
 
   static void initCache(configcache **cache,
                        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); 
+                       char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_RW, ostream* _log=NULL); 

 
   static void initCache( configcache **cache,
 
   static void initCache( configcache **cache,

-                        const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL);
+                        const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_RW);

 
   static configcache *C;
 
   static configcache *C;

-  static vector<configcache*> Os;
+  static vector<observable> Os;

   static vector<para> delayedParaAdd;
   static vector<para> delayedParaSet;
 
   static vector<para> delayedParaAdd;
   static vector<para> delayedParaSet;
 


@@ -68,8 +78,6 @@ class hypercache {
   static int nequileft;
 
   static pair<int, char*> mostEquilibratedConfig;
   static int nequileft;
 
   static pair<int, char*> mostEquilibratedConfig;

-
-  static int lastWrittenObsEquis;

 };
 
 #endif
 };
 
 #endif