implemented parameter linking.

[phys/latlib.git] / paraq.h

diff --git a/paraq.h b/paraq.h
index ef4376bf9a4ff7211305a819afdebc5433b1847a..0167bcb335b6e17862a983c1b8e61e25e0643da9 100644 (file)
--- a/paraq.h
+++ b/paraq.h
@@ -15,9 +15,14 @@ class paraq {
   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);
   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; }
+  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();
   int getTotalJobs();
   string rangeString();

+  vector<string> allParaIds;
+  string getParaNames();
+  string getParaVals();

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


@@ -25,11 +30,13 @@ class paraq {
   map<string,double> defaultPara;
   map< string, vector<double> > paraMap;
   map< string, vector<double*> > rangeMap;
   map<string,double> defaultPara;
   map< string, vector<double> > paraMap;
   map< string, vector<double*> > rangeMap;

+  vector< pair<string,string> > linkedParas;

   vector< map<string,double>  > jobList;
   void initJobList();
   bool inParas(vector<double>& paraVec, double& tofind);
   double masterdefault;
   bool jobListInitialized;
   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