X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/03a0d20d92b54e75ac862b9e41ede061b1918498..074bd4d5f4b73c85da8f105ba3bfca00bf490ac8:/paraq.cpp?ds=sidebyside

diff --git a/paraq.cpp b/paraq.cpp
index 1bd57b3..d512c9c 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,10 +17,64 @@ 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 (vector<paralink>::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+    rangestring << "-" << linkit->first << "--" << linkit->linktype << "--" << 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<paralink>::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 )
@@ -38,7 +94,13 @@ void paraq::initJobList()
       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<paralink>::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+	    if (linkit->second == paraIt->first)
+	      jobList.back()[linkit->first] = linkTypeFunction(*valIt, linkit->linktype);
 	}	
 	jobList.erase( jobList.begin() );
       }
@@ -46,6 +108,18 @@ void paraq::initJobList()
   }
 }
 
+double paraq::linkTypeFunction (double linkval, int linktype) {
+  switch (linktype) {
+
+  case LINK_1TO1:
+    return linkval;
+
+  case LINK_NEGATIVE:
+    return -linkval;
+
+  }
+}
+
 int paraq::nextParas()
 {
   if( thisjob == -1 ) {   
@@ -71,10 +145,40 @@ double& paraq::operator[] (string paraid) {
     return defaultPara[paraid];
   }
 
-  return masterdefault;
+  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();
+}