minor changes to test.

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index 82fa3f6787ccba006b242f56b645e00afcbf4b9c..5e48cbf06bf39fabc957a0b34a753acba240b0c7 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -28,7 +28,6 @@ struct infiledesc {
   string filename;
   int nequi;
   int nskip;
   string filename;
   int nequi;
   int nskip;

-  bool doVirtualEquilibration;

   bool extended;
 };
 
   bool extended;
 };
 


@@ -37,29 +36,32 @@ class configcache{
   ~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);
   ~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);

-  int readConfig(vector<unsigned long> *excludeFileHashes=NULL);
-  void writeConfig();
+  void readConfig(bool& readnewconfig, int& nequileft, vector<unsigned long> *excludeFileHashes=NULL);
+  void writeConfig(int actnequi);

   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);
   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);

-  void writeHeader(const string& headerid, const char *header, long unsigned int size);
+  void writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi);

   void * getHeader(const string& headerid);
   string getOutFileName() { return outFileName.str(); }
   string getInFileName() { return DATADIR + "/" + openFileDesc.filename; }
   static unsigned long hash(const string& str);
   void closeInFile() { inFile.close(); }
   int inFilesLeft() { return inFiles.size(); }
   void * getHeader(const string& headerid);
   string getOutFileName() { return outFileName.str(); }
   string getInFileName() { return DATADIR + "/" + openFileDesc.filename; }
   static unsigned long hash(const string& str);
   void closeInFile() { inFile.close(); }
   int inFilesLeft() { return inFiles.size(); }

+  char* getConfigMem() { return configMem; }
+  int getConfigSize() { return configSize; }
+  bool isOutFileOpen () { return outFile.is_open(); }
+  void finishOutFile();

 
  private:
   ostream* log;
   infiledesc openFileDesc;
 
  private:
   ostream* log;
   infiledesc openFileDesc;

-  void finishOutFile();

   int getParIndex(const string& parid);
   int NEQUI;
   int NSKIP;
   string DATADIR;
   string CACHEID;
   int MODE;
   int getParIndex(const string& parid);
   int NEQUI;
   int NSKIP;
   string DATADIR;
   string CACHEID;
   int MODE;

-  string getFileId(const bool& shortid=false);
+  string getFileId(int actnequi, const bool& shortid=false);

 
   ofstream outFile;
   ifstream inFile;
 
   ofstream outFile;
   ifstream inFile;


@@ -89,7 +91,7 @@ class configcache{
 
   int readDataToMem(char *tmpData, long unsigned int dataSize);
 
 
   int readDataToMem(char *tmpData, long unsigned int dataSize);
 

-  void openOutFile();
+  void openOutFile(int actnequi);

 
   int readHeader();
 
 
   int readHeader();
 


@@ -104,6 +106,10 @@ class configcache{
   bool readAllHeaders();
 
   vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
   bool readAllHeaders();
 
   vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);

+
+  int nequileft_internal;
+
+  bool doVirtualEquilibration, firstUsedConfig;

 };
 
 #endif
 };
 
 #endif