...

[phys/latlib.git] / paraq.h

diff --git a/paraq.h b/paraq.h
index 9aaf1d0d8cd64b2a384f8d7f840c94df407d873c..0167bcb335b6e17862a983c1b8e61e25e0643da9 100644 (file)
--- a/paraq.h
+++ b/paraq.h
@@ -11,13 +11,32 @@ class paraq {
  public: 
   paraq(int nprocs, int rank);
   void addRange(const string& paraid, double min, double max, double step);
  public: 
   paraq(int nprocs, int rank);
   void addRange(const string& paraid, double min, double max, double step);

-  map<string,double>* nextParas();
+  int nextParas();
+  double& operator[] (string paraid);
+  void addRange(const string& paraid, double range[3]) { addRange(paraid, range[0], range[1], range[2]); }
+  void addRange(const string& paraid, char *range);
+  void setDefault(const string& paraid, double value) { defaultPara[paraid] = value; uniqueAllParaIdsAdd(paraid); }
+  
+  void linkParas(const string& paraid1, const string &paraid2) { linkedParas.push_back( make_pair(paraid1,paraid2) );  }
+  int getTotalJobs();
+  string rangeString();
+  vector<string> allParaIds;
+  string getParaNames();
+  string getParaVals();

 
  private:
   int nprocs, rank;
 
  private:
   int nprocs, rank;

-  int lastjob;
-  map< string, vector< double* > > paraMap;
+  int thisjob;
+  map<string,double> defaultPara;
+  map< string, vector<double> > paraMap;
+  map< string, vector<double*> > rangeMap;
+  vector< pair<string,string> > linkedParas;

   vector< map<string,double>  > jobList;
   vector< map<string,double>  > jobList;

+  void initJobList();
+  bool inParas(vector<double>& paraVec, double& tofind);
+  double masterdefault;
+  bool jobListInitialized;
+  void uniqueAllParaIdsAdd(const string& paraid);

 };
 
 #endif
 };
 
 #endif