...

diff --git a/paraq.cpp b/paraq.cpp
index e66f13860ff44a8880319a0224fd5458356a489d..1bd57b3275f428a38bb597a451b8da900f070713 100644 (file)
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -12,6 +12,7 @@ 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, double min, double max, double step)
 }
 
 void paraq::addRange(const string& paraid, double min, double max, double step)


@@ -27,12 +28,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 +42,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 +73,8 @@ double& paraq::operator[] (string paraid) {
 
   return masterdefault;
 }
 
   return masterdefault;
 }

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

diff --git a/paraq.h b/paraq.h
index 71089740770155509ccc1f1366ee0d47dcbcbe4c..6f6a1a064e1b310383fbd5cc77b075da6bfc5e1a 100644 (file)
--- a/paraq.h
+++ b/paraq.h
@@ -15,6 +15,7 @@ class paraq {
   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; }
   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; }

+  int getTotalJobs();

 
  private:
   int nprocs, rank;
 
  private:
   int nprocs, rank;


@@ -22,8 +23,10 @@ class paraq {
   map<string,double> defaultPara;
   map< string, vector<double> > paraMap;
   vector< map<string,double>  > jobList;
   map<string,double> defaultPara;
   map< string, vector<double> > paraMap;
   vector< map<string,double>  > jobList;

+  void initJobList();

   bool inParas(vector<double>& paraVec, double& tofind);
   double masterdefault;
   bool inParas(vector<double>& paraVec, double& tofind);
   double masterdefault;

+  bool jobListInitialized;

 };
 
 #endif
 };
 
 #endif