added linktype feature to paralinks.

[phys/latlib.git] / paraq.h

diff --git a/paraq.h b/paraq.h
index 0167bcb335b6e17862a983c1b8e61e25e0643da9..70070f39e43f40df6fc10da6a998becacb78b912 100644 (file)
--- a/paraq.h
+++ b/paraq.h
@@ -5,9 +5,19 @@
 #include <map>
 #include <vector>
 
 #include <map>
 #include <vector>
 

+#define LINK_1TO1 0
+#define LINK_NEGATIVE 1
+

 using namespace std;
 
 class paraq {
 using namespace std;
 
 class paraq {

+ private:
+  struct paralink {
+    string first;
+    string second;
+    int linktype;
+  };
+

  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);


@@ -17,7 +27,16 @@ class paraq {
   void addRange(const string& paraid, char *range);
   void setDefault(const string& paraid, double value) { defaultPara[paraid] = value; uniqueAllParaIdsAdd(paraid); }
   
   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) );  }
+  void linkParas(const string& paraid1, const string &paraid2, int linktype=LINK_1TO1) {
+    paralink tmpLink;
+
+    tmpLink.first = paraid1;
+    tmpLink.second = paraid2;
+    tmpLink.linktype = linktype;
+
+    linkedParas.push_back( tmpLink );
+    //linkedParas.push_back( make_pair(paraid1,paraid2) );
+  }

   int getTotalJobs();
   string rangeString();
   vector<string> allParaIds;
   int getTotalJobs();
   string rangeString();
   vector<string> allParaIds;


@@ -30,13 +49,14 @@ 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<paralink> linkedParas;

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

+  double linkTypeFunction (double linkval, int linktype);

 };
 
 #endif
 };
 
 #endif