minor changes to test.

[phys/latlib.git] / paraq.cpp

diff --git a/paraq.cpp b/paraq.cpp
index 3f7eb294f1ae7b327814811eecd7f700c7905465..93496fcc230fb6a77dc7a0d3e8eab2b4c10da6c0 100644 (file)
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -1,41 +1,172 @@
 #include "paraq.h"
 
+#include <algorithm>
+#include <iostream>
+#include <math.h>
+#include <string.h>
+#include <sstream>
+
+using namespace std;
+
 paraq::paraq(int _nprocs, const int _rank)
 {
-  lastjob = -1;
+  thisjob = -1;
   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, char *range)
 {
-  double *range = new double[3];
-  range[0] = min;
-  range[1] = max;
-  range[2] = step;
+  int nargs=0;
+  double goodrange[3];
 
-  paraMap[paraid].push_back( range );
+  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]);
 }
 
-map<string,double>* paraq::nextParas()
+string paraq::rangeString()
 {
-  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] ) {
+  stringstream rangestring;
 
-           //if( paraval == *rangeIt[0] )
-           //else
+  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 (vector< pair<string,string> >::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+    rangestring << "-" << linkit->first << "->" << linkit->second;
 
-         }
+  for( map<string,double>::iterator defIt = defaultPara.begin(); defIt != defaultPara.end(); ++defIt )
+    if( rangeMap.find(defIt->first) == rangeMap.end() ) {
+      bool linkedpara = false;
 
+      for (vector< pair<string,string> >::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+       if (linkit->first == defIt->first) {
+         linkedpara = true;
+         break;
        }
 
-      }
+      if (!linkedpara)
+       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 );
+
+  uniqueAllParaIdsAdd(paraid);
+}
+
+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;
+}
+
+void paraq::initJobList()
+{
+  if( ! jobListInitialized ) {
+    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 ) {
+         jobList.push_back( *jobList.begin() );
+
+         jobList.back()[paraIt->first] = *valIt;
+
+         /* also set linked parameters */
+         for (vector< pair<string,string> >::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+           if (linkit->second == paraIt->first)
+             jobList.back()[linkit->first] = *valIt;
+       }       
+       jobList.erase( jobList.begin() );
+      }
+    jobListInitialized = true;
   }
 }
+
+int paraq::nextParas()
+{
+  if( thisjob == -1 ) {   
+    initJobList();
+    thisjob = rank;
+  }
+  else
+    thisjob += nprocs;
+
+  if( jobList.begin()->size() == 0 ) return 0;
+
+  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];
+  }
+
+  cerr << "PARAQ: Parameter " << paraid << " does not exist!" << endl << flush;
+  exit(1);
+}
+
+int paraq::getTotalJobs() { 
+  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();
+}