...

[phys/latlib.git] / paraq.cpp

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