Opening cachefiles exclusively with O_EXCL.

[phys/latlib.git] / paraq.cpp

diff --git a/paraq.cpp b/paraq.cpp
index 773beb46ccb98c4c44fdc307a43de9b08a84ad52..d512c9c30b911704ef291950cbc871f87d36426c 100644 (file)
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -43,14 +43,14 @@ string paraq::rangeString()
       for( vector<double*>::iterator rangeIt = paraIt->second.begin(); rangeIt != paraIt->second.end(); ++rangeIt)
        rangestring << "-" << paraIt->first << (*rangeIt)[0] << "_" << (*rangeIt)[1] << "_" << (*rangeIt)[2];
   
       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 (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( 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)
+      for (vector<paralink>::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)

        if (linkit->first == defIt->first) {
          linkedpara = true;
          break;
        if (linkit->first == defIt->first) {
          linkedpara = true;
          break;


@@ -98,9 +98,9 @@ void paraq::initJobList()
          jobList.back()[paraIt->first] = *valIt;
 
          /* also set linked parameters */
          jobList.back()[paraIt->first] = *valIt;
 
          /* also set linked parameters */

-         for (vector< pair<string,string> >::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+         for (vector<paralink>::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)

            if (linkit->second == paraIt->first)
            if (linkit->second == paraIt->first)

-             jobList.back()[linkit->first] = *valIt;
+             jobList.back()[linkit->first] = linkTypeFunction(*valIt, linkit->linktype);

        }       
        jobList.erase( jobList.begin() );
       }
        }       
        jobList.erase( jobList.begin() );
       }


@@ -108,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 ) {   
 int paraq::nextParas()
 {
   if( thisjob == -1 ) {