improved argument handling.

[phys/latlib.git] / paraq.h

diff --git a/paraq.h b/paraq.h
index 71089740770155509ccc1f1366ee0d47dcbcbe4c..6aba45b9da3c524d2b186d429b03029296e7e141 100644 (file)
--- a/paraq.h
+++ b/paraq.h
@@ -14,16 +14,24 @@ class paraq {
   int nextParas();
   double& operator[] (string paraid);
   void addRange(const string& paraid, double range[3]) { addRange(paraid, range[0], range[1], range[2]); }
-  void setDefault(const string& paraid, double value) { defaultPara[paraid] = value; }
+  void addRange(const string& paraid, char *range);
+  void setDefault(const string& paraid, double value) { defaultPara[paraid] = value; uniqueAllParaIdsAdd(paraid); }
+  int getTotalJobs();
+  string rangeString();
+  vector<string> allParaIds;
 
  private:
   int nprocs, rank;
   int thisjob;
   map<string,double> defaultPara;
   map< string, vector<double> > paraMap;
+  map< string, vector<double*> > rangeMap;
   vector< map<string,double>  > jobList;
+  void initJobList();
   bool inParas(vector<double>& paraVec, double& tofind);
   double masterdefault;
+  bool jobListInitialized;
+  void uniqueAllParaIdsAdd(const string& paraid);
 };
 
 #endif