X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/22d4f36d4bbd95447a454cceb9084af46927e023..79dc42fe36820965127efc5755be1450521b0a26:/hypercache.h?ds=inline

diff --git a/hypercache.h b/hypercache.h
index 523cc56..c5f548a 100644
--- a/hypercache.h
+++ b/hypercache.h
@@ -2,6 +2,7 @@
 #define HYPERCACHE_H
 
 #include <iostream>
+#include <ostream>
 
 #include "configcache.h"
 
@@ -10,28 +11,33 @@ using namespace std;
 class hypercache {
  public:
   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, writeout *out_a=NULL) {
+		   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, out_a);
+    initCache(&Os.back(), 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, 
-		    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_FULL, 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 int readO(int obsid);
-  static int readC();
+  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) { Os[obsid]->writeHeader(headerid, header, size); }
+  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 writeHeaderC(const string& headerid, char *header, long unsigned int size) { C->writeHeader(headerid, header, size); }
+  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 int CFilesLeft() { return C->inFilesLeft(); }
   
  private:
   struct para{
@@ -41,7 +47,7 @@ class hypercache {
 
   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_FULL, ostream* _log=NULL); 
 
   static void initCache( configcache **cache,
 			 const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL);
@@ -50,12 +56,20 @@ class hypercache {
   static vector<configcache*> Os;
   static vector<para> delayedParaAdd;
   static vector<para> delayedParaSet;
-  static writeout *out;
 
   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;
+
+  static int lastWrittenObsEquis;
 };
 
 #endif