implemented parameter linking.

diff --git a/paraq.cpp b/paraq.cpp
index 87ec7734018bc01a662a1f16ec45a0f36a3f1d63..93496fcc230fb6a77dc7a0d3e8eab2b4c10da6c0 100644 (file)
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -43,9 +43,22 @@ string paraq::rangeString()
       for( vector<double*>::iterator rangeIt = paraIt->second.begin(); rangeIt != paraIt->second.end(); ++rangeIt)
        rangestring << "-" << paraIt->first << (*rangeIt)[0] << "_" << (*rangeIt)[1] << "_" << (*rangeIt)[2];
   
       for( vector<double*>::iterator rangeIt = paraIt->second.begin(); rangeIt != paraIt->second.end(); ++rangeIt)
        rangestring << "-" << paraIt->first << (*rangeIt)[0] << "_" << (*rangeIt)[1] << "_" << (*rangeIt)[2];
   

+  for (vector< pair<string,string> >::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+    rangestring << "-" << linkit->first << "->" << linkit->second;
+

   for( map<string,double>::iterator defIt = defaultPara.begin(); defIt != defaultPara.end(); ++defIt )
   for( map<string,double>::iterator defIt = defaultPara.begin(); defIt != defaultPara.end(); ++defIt )

-    if( rangeMap.find(defIt->first) == rangeMap.end() )
-      rangestring << "-" << defIt->first << defIt->second;
+    if( rangeMap.find(defIt->first) == rangeMap.end() ) {
+      bool linkedpara = false;
+
+      for (vector< pair<string,string> >::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+       if (linkit->first == defIt->first) {
+         linkedpara = true;
+         break;
+       }
+
+      if (!linkedpara)
+       rangestring << "-" << defIt->first << defIt->second;
+    }

 
   return rangestring.str();
 }
 
   return rangestring.str();
 }


@@ -81,7 +94,13 @@ void paraq::initJobList()
       while( jobList.begin()->find(paraIt->first) == jobList.begin()->end() ) {
        for( vector<double>::iterator valIt = paraIt->second.begin(); valIt != paraIt->second.end(); ++valIt ) {
          jobList.push_back( *jobList.begin() );
       while( jobList.begin()->find(paraIt->first) == jobList.begin()->end() ) {
        for( vector<double>::iterator valIt = paraIt->second.begin(); valIt != paraIt->second.end(); ++valIt ) {
          jobList.push_back( *jobList.begin() );

+

          jobList.back()[paraIt->first] = *valIt;
          jobList.back()[paraIt->first] = *valIt;

+
+         /* also set linked parameters */
+         for (vector< pair<string,string> >::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+           if (linkit->second == paraIt->first)
+             jobList.back()[linkit->first] = *valIt;

        }       
        jobList.erase( jobList.begin() );
       }
        }       
        jobList.erase( jobList.begin() );
       }

diff --git a/paraq.h b/paraq.h
index 6dc582d6b575ca2a30cc99b9eddc852e8b9800df..0167bcb335b6e17862a983c1b8e61e25e0643da9 100644 (file)
--- a/paraq.h
+++ b/paraq.h
@@ -16,6 +16,8 @@ class paraq {
   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 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;
   int getTotalJobs();
   string rangeString();
   vector<string> allParaIds;


@@ -28,6 +30,7 @@ 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);
   vector< map<string,double>  > jobList;
   void initJobList();
   bool inParas(vector<double>& paraVec, double& tofind);