...

[phys/latlib.git] / o815 / o815.h

diff --git a/o815/o815.h b/o815/o815.h
index 79d427dbb415dfe3c687579eb0c0d8eb93d5dcfa..0e2a611af71e064e8b55bb5b93577466dab5424d 100644 (file)
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -42,12 +42,16 @@ class o815 {
   class sim {
   public:
     sim(o815 *_O815, const int& _confmemSize);
+    ~sim ();
     void nextConfig();
     char *confMem;
     virtual void _newParas()=0;
     int nequi, nskip;
+    void resetConfig();
   private:
     virtual void _makeSweep()=0;
+    virtual void _resetConfig()=0;
+    char *startConfiguration;
   protected:
     o815 *O815;
     ostream *log;
@@ -64,6 +68,7 @@ class o815 {
     string outdir;
     int idonly;
     int showjobnum;
+    string startconfig;
   } comargs;
 
   struct comoption {
@@ -83,7 +88,7 @@ class o815 {
   vector<obs*> observables;
   sim* Sim;
   void mainLoop();
-  string headMaster();
+  string headMaster( bool hashedrange=false );
   void addPara(const string& paraid, const double& paraDefault);
   void addComOption(const char* name, int has_arg, int *flag, int val, const char* optdesc, const char* argdesc);
   vector< pair<int,char*> > parsedSpecOps;
@@ -98,6 +103,7 @@ private:
   int nextParas();
   comoption* getOptionByVal(int val);
   static void readCacheArgs(const string& arg, string& cachedir, int& cachemode);
+  unsigned long hash(const string& str);
 };
 
 #endif