X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/03a0d20d92b54e75ac862b9e41ede061b1918498..3db2602cfe30c61445e89cc334541ebb4ff76ed8:/paraq.cpp?ds=inline

diff --git a/paraq.cpp b/paraq.cpp
index 1bd57b3..b1e3292 100644
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -3,6 +3,8 @@
 #include <algorithm>
 #include <iostream>
 #include <math.h>
+#include <string.h>
+#include <sstream>
 
 using namespace std;
 
@@ -15,8 +17,47 @@ paraq::paraq(int _nprocs, const int _rank)
   jobListInitialized = false;
 }
 
+void paraq::addRange(const string& paraid, char *range)
+{
+  int nargs=0;
+  double goodrange[3];
+
+  for( int pos=0; pos<strlen(range); pos++ ) 
+    if( range[pos] == ':' ) nargs++;
+  if(nargs==0) 
+    for(int i=0; i<3; i++) goodrange[i] = strtod(range, NULL);
+  else{
+    goodrange[0] = strtod(strtok(range, ":"), NULL);
+    for(int i=0; i<nargs; i++) goodrange[i+1] = strtod(strtok(NULL, ":"), NULL);
+  }
+
+  addRange(paraid, goodrange[0], goodrange[1], goodrange[2]);
+}
+
+string paraq::rangeString()
+{
+  stringstream rangestring;
+
+  for( map< string, vector<double*> >::iterator paraIt = rangeMap.begin(); paraIt != rangeMap.end(); ++paraIt )
+    if( paraIt->second.size() > 0 )
+      for( vector<double*>::iterator rangeIt = paraIt->second.begin(); rangeIt != paraIt->second.end(); ++rangeIt)
+	rangestring << "-" << paraIt->first << (*rangeIt)[0] << "_" << (*rangeIt)[1] << "_" << (*rangeIt)[2];
+  
+  for( map<string,double>::iterator defIt = defaultPara.begin(); defIt != defaultPara.end(); ++defIt )
+    if( rangeMap.find(defIt->first) == rangeMap.end() )
+      rangestring << "-" << defIt->first << defIt->second;
+
+  return rangestring.str();
+}
+
 void paraq::addRange(const string& paraid, double min, double max, double step)
 {
+  double *newrange = new double[3];
+  newrange[0] = min;
+  newrange[1] = max;
+  newrange[2] = step;
+  rangeMap[paraid].push_back( newrange );
+  
   for( double paraval = min; paraval <= max+0.5*step; paraval += step+(step==0) )
     if( ! inParas(paraMap[paraid], paraval) ) paraMap[paraid].push_back( paraval );
 }