improved argument handling.

[phys/latlib.git] / hypercache.h

diff --git a/hypercache.h b/hypercache.h
index 523cc56e8831bedbc44d63046d72dd276391a73a..a30e28eae462b669971228c57c30aeef4d22ad96 100644 (file)
--- a/hypercache.h
+++ b/hypercache.h
@@ -2,6 +2,7 @@
 #define HYPERCACHE_H
 
 #include <iostream>
+#include <ostream>
 
 #include "configcache.h"
 
@@ -10,14 +11,14 @@ 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);
   }
   
   static void addPara(const string& parid, const double& val=0);
@@ -32,6 +33,9 @@ class hypercache {
   static void *getHeaderC(const string& headerid) { C->getHeader(headerid); }
 
   static void finalize();
+
+  static int read1CForEqui();
+  static int CFilesLeft() { return C->inFilesLeft(); }
   
  private:
   struct para{
@@ -41,7 +45,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 +54,12 @@ 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;
 };
 
 #endif