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 6997d8221ca81d51e523fe172b69e713097e88d6..199b7e731d0dca88fbc417f0cf4c643d68aa03e3 100644 (file)
--- a/hypercache.h
+++ b/hypercache.h
@@ -2,6 +2,7 @@
 #define HYPERCACHE_H
 
 #include <iostream>
 #define HYPERCACHE_H
 
 #include <iostream>

+#include <ostream>

 
 #include "configcache.h"
 
 
 #include "configcache.h"
 


@@ -9,27 +10,44 @@ using namespace std;
 
 class hypercache {
  public:
 
 class hypercache {
  public:

-  static void initO(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) {
-    initCache(&O, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);
+  struct observable{
+    configcache *c;
+    int lastWrittenObsEquis;
+  };
+
+  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_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, 
   }
   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, writeout *out_a=NULL) {
-    initCache(&C, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);
+                   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];

   }
   }

+
+  static int getNEquiLeft() { return nequileft; }

   
   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 bool readO() { return O->readConfig(); }
-  static bool readC() { return C->readConfig(); }
-  static void writeO() { O->writeConfig(); }
-  static void writeC() { C->writeConfig(); }
-  static void writeHeaderO(const string& headerid, char *header, long unsigned int size) { O->writeHeader(headerid, header, size); }
-  static void *getHeaderO(const string& headerid) { O->getHeader(headerid); }
-  static void writeHeaderC(const string& headerid, char *header, long unsigned int size) { C->writeHeader(headerid, header, size); }
+  static void readO(int obsid, bool *readNewObsConfig, int *nequiObsLeft);
+  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].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 finalize();
   static void *getHeaderC(const string& headerid) { C->getHeader(headerid); }
 
   static void finalize();

+
+  static int CFilesLeft() { return C->inFilesLeft(); }

   
  private:
   struct para{
   
  private:
   struct para{


@@ -39,15 +57,27 @@ 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, writeout *out_a=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 *O;

   static configcache *C;
   static configcache *C;

+  static vector<observable> Os;

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

+
+  static string fileOfPath(const string& dressedfile);
+  static string activeCFile;
+  static vector<unsigned long> parentConfigs;
+  static void addParentConfig(const unsigned long *parentconfig);
+  static ostream* log;
+
+  static int NEQUI;
+  static int NSKIP;
+  static int nequileft;
+
+  static pair<int, char*> mostEquilibratedConfig;

 };
 
 #endif
 };
 
 #endif