X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/1b842b9fcf404b5973c01ce883eafc53553b83c9..074bd4d5f4b73c85da8f105ba3bfca00bf490ac8:/paraq.cpp?ds=sidebyside diff --git a/paraq.cpp b/paraq.cpp index 93496fc..d512c9c 100644 --- a/paraq.cpp +++ b/paraq.cpp @@ -43,14 +43,14 @@ string paraq::rangeString() for( vector::iterator rangeIt = paraIt->second.begin(); rangeIt != paraIt->second.end(); ++rangeIt) rangestring << "-" << paraIt->first << (*rangeIt)[0] << "_" << (*rangeIt)[1] << "_" << (*rangeIt)[2]; - for (vector< pair >::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit) - rangestring << "-" << linkit->first << "->" << linkit->second; + for (vector::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit) + rangestring << "-" << linkit->first << "--" << linkit->linktype << "--" << linkit->second; for( map::iterator defIt = defaultPara.begin(); defIt != defaultPara.end(); ++defIt ) if( rangeMap.find(defIt->first) == rangeMap.end() ) { bool linkedpara = false; - for (vector< pair >::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit) + for (vector::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit) if (linkit->first == defIt->first) { linkedpara = true; break; @@ -98,9 +98,9 @@ void paraq::initJobList() jobList.back()[paraIt->first] = *valIt; /* also set linked parameters */ - for (vector< pair >::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit) + for (vector::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit) if (linkit->second == paraIt->first) - jobList.back()[linkit->first] = *valIt; + jobList.back()[linkit->first] = linkTypeFunction(*valIt, linkit->linktype); } 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 ) {