...

[phys/latlib.git] / paraq.cpp

diff --git a/paraq.cpp b/paraq.cpp
index e66f13860ff44a8880319a0224fd5458356a489d..b1e3292d43e1224606443bed0dd5e9257fca6d63 100644 (file)
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -3,6 +3,8 @@
 #include <algorithm>
 #include <iostream>
 #include <math.h>
 #include <algorithm>
 #include <iostream>
 #include <math.h>

+#include <string.h>
+#include <sstream>

 
 using namespace std;
 
 
 using namespace std;
 


@@ -12,10 +14,50 @@ paraq::paraq(int _nprocs, const int _rank)
   nprocs = _nprocs;
   rank = _rank;
   masterdefault = 0;
   nprocs = _nprocs;
   rank = _rank;
   masterdefault = 0;

+  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)
 {
 }
 
 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 );
 }
   for( double paraval = min; paraval <= max+0.5*step; paraval += step+(step==0) )
     if( ! inParas(paraMap[paraid], paraval) ) paraMap[paraid].push_back( paraval );
 }


@@ -27,12 +69,12 @@ bool paraq::inParas( vector<double>& paraVec, double& tofind )
   return false;
 }
 
   return false;
 }
 

-int paraq::nextParas()
+void paraq::initJobList()

 {
 {

-  if( thisjob == -1 ) {   
+  if( ! jobListInitialized ) {

     map<string,double> jobZero;
     jobList.push_back( jobZero );
     map<string,double> jobZero;
     jobList.push_back( jobZero );

-
+    

     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 ) {
     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 ) {


@@ -41,12 +83,21 @@ int paraq::nextParas()
        }       
        jobList.erase( jobList.begin() );
       }
        }       
        jobList.erase( jobList.begin() );
       }

+    jobListInitialized = true;
+  }
+}

 
 

+int paraq::nextParas()
+{
+  if( thisjob == -1 ) {   
+    initJobList();

     thisjob = rank;
   }
   else
     thisjob += nprocs;
 
     thisjob = rank;
   }
   else
     thisjob += nprocs;
 

+  if( jobList.begin()->size() == 0 ) return 0;
+

   if( thisjob < jobList.size() ) return 1;
   else 
     return 0;
   if( thisjob < jobList.size() ) return 1;
   else 
     return 0;


@@ -63,3 +114,8 @@ double& paraq::operator[] (string paraid) {
 
   return masterdefault;
 }
 
   return masterdefault;
 }

+
+int paraq::getTotalJobs() { 
+  initJobList();
+  return jobList.size(); 
+}