...

diff --git a/paraq.cpp b/paraq.cpp
index 3f7eb294f1ae7b327814811eecd7f700c7905465..e66f13860ff44a8880319a0224fd5458356a489d 100644 (file)
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -1,41 +1,65 @@
 #include "paraq.h"
 
+#include <algorithm>
+#include <iostream>
+#include <math.h>
+
+using namespace std;
+
 paraq::paraq(int _nprocs, const int _rank)
 {
-  lastjob = -1;
+  thisjob = -1;
   nprocs = _nprocs;
   rank = _rank;
+  masterdefault = 0;
 }
 
 void paraq::addRange(const string& paraid, double min, double max, double step)
 {
-  double *range = new double[3];
-  range[0] = min;
-  range[1] = max;
-  range[2] = step;
+  for( double paraval = min; paraval <= max+0.5*step; paraval += step+(step==0) )
+    if( ! inParas(paraMap[paraid], paraval) ) paraMap[paraid].push_back( paraval );
+}
 
-  paraMap[paraid].push_back( range );
+bool paraq::inParas( vector<double>& paraVec, double& tofind )
+{
+  for( vector<double>::iterator it = paraVec.begin(); it < paraVec.end(); ++it) 
+    if( fabs(*it - tofind) < 0.0000000001 ) return true;
+  return false;
 }
 
-map<string,double>* paraq::nextParas()
+int paraq::nextParas()
 {
-  if( lastjob == -1 ) {
-    lastjob = 0;
-    
-    for( map< string, vector< double* > >::iterator paraIt = paraMap.begin(); paraIt != paraMap.end(); ++paraIt ) {
-      for( vector< map<string,double>  >::iterator jobIt = jobList.begin(); jobIt != jobList.end(); ++jobIt) {
-       for( vector<double*>::iterator rangeIt = paraIt->second.begin(); rangeIt != paraIt->second.end(); ++rangeIt ) {
-         
-         for( double paraval = *rangeIt[0]; paraval < *rangeIt[1]; paraval += *rangeIt[2] ) {
+  if( thisjob == -1 ) {   
+    map<string,double> jobZero;
+    jobList.push_back( jobZero );
 
-           //if( paraval == *rangeIt[0] )
-           //else
+    for( map< string, vector< double > >::iterator paraIt = paraMap.begin(); paraIt != paraMap.end(); ++paraIt )
+      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.erase( jobList.begin() );
+      }
 
-         }
+    thisjob = rank;
+  }
+  else
+    thisjob += nprocs;
 
-       }
+  if( thisjob < jobList.size() ) return 1;
+  else 
+    return 0;
+}
 
-      }
-    }
+double& paraq::operator[] (string paraid) { 
+  if( jobList[thisjob].find(paraid) != jobList[thisjob].end() ) {
+    return jobList[thisjob][paraid];
   }
+
+  if( defaultPara.find(paraid) != defaultPara.end() ) {
+    return defaultPara[paraid];
+  }
+
+  return masterdefault;
 }

diff --git a/paraq.h b/paraq.h
index 9aaf1d0d8cd64b2a384f8d7f840c94df407d873c..71089740770155509ccc1f1366ee0d47dcbcbe4c 100644 (file)
--- a/paraq.h
+++ b/paraq.h
@@ -11,13 +11,19 @@ class paraq {
  public: 
   paraq(int nprocs, int rank);
   void addRange(const string& paraid, double min, double max, double step);
-  map<string,double>* nextParas();
+  int nextParas();
+  double& operator[] (string paraid);
+  void addRange(const string& paraid, double range[3]) { addRange(paraid, range[0], range[1], range[2]); }
+  void setDefault(const string& paraid, double value) { defaultPara[paraid] = value; }
 
  private:
   int nprocs, rank;
-  int lastjob;
-  map< string, vector< double* > > paraMap;
+  int thisjob;
+  map<string,double> defaultPara;
+  map< string, vector<double> > paraMap;
   vector< map<string,double>  > jobList;
+  bool inParas(vector<double>& paraVec, double& tofind);
+  double masterdefault;
 };
 
 #endif