...

[phys/latlib.git] / paraq.cpp

diff --git a/paraq.cpp b/paraq.cpp
index b1e3292d43e1224606443bed0dd5e9257fca6d63..ac8fc14ff77ac4897ba082e1b847ce1712f5120a 100644 (file)
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -60,6 +60,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 );
   
   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 )
 }
 
 bool paraq::inParas( vector<double>& paraVec, double& tofind )


@@ -119,3 +121,32 @@ int paraq::getTotalJobs() {
   initJobList();
   return jobList.size(); 
 }
   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();
+}