...

[phys/latlib.git] / paraq.cpp

diff --git a/paraq.cpp b/paraq.cpp
index b1e3292d43e1224606443bed0dd5e9257fca6d63..773beb46ccb98c4c44fdc307a43de9b08a84ad52 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< 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 )
-    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();
 }
@@ -60,6 +73,8 @@ void paraq::addRange(const string& paraid, double min, double max, double step)
   
   for( double paraval = min; paraval <= max+0.5*step; paraval += step+(step==0) )
     if( ! inParas(paraMap[paraid], paraval) ) paraMap[paraid].push_back( paraval );
+
+  uniqueAllParaIdsAdd(paraid);
 }
 
 bool paraq::inParas( vector<double>& paraVec, double& tofind )
@@ -79,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() );
+
          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() );
       }
@@ -112,10 +133,40 @@ double& paraq::operator[] (string paraid) {
     return defaultPara[paraid];
   }
 
-  return masterdefault;
+  cerr << "PARAQ: Parameter " << paraid << " does not exist!" << endl << flush;
+  exit(1);
 }
 
 int paraq::getTotalJobs() { 
   initJobList();
   return jobList.size(); 
 }
+
+void paraq::uniqueAllParaIdsAdd(const string& paraid) {
+  for (vector<string>::iterator allparait = allParaIds.begin(); allparait != allParaIds.end(); ++allparait)
+    if ( *allparait == paraid )
+      return;
+
+  allParaIds.push_back(paraid);
+}
+
+string paraq::getParaNames() {
+  stringstream paranames;
+  
+  for (vector<string>::iterator parait = allParaIds.begin(); parait != allParaIds.end(); ++parait)
+    paranames << *parait << ":";
+  
+  return paranames.str();
+}
+
+string paraq::getParaVals() {
+  stringstream paravals;
+
+  for (vector<string>::iterator parait = allParaIds.begin(); parait != allParaIds.end(); ++parait) {
+    if ( parait != allParaIds.begin() )
+      paravals << "\t";
+    paravals << (*this)[*parait];
+  }
+
+  return paravals.str();
+}