stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove spurious test.

time-shift
Sébastien Villemot 2014-03-11 17:12:46 +01:00
parent 3e00a99cc6
commit 1f6fd55594
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
preprocessor/ExprNode.cc
View File

@ -4320,9 +4320,8 @@ ExternalFunctionNode::composeDerivatives(const vector<expr_t> &dargs)
{ {
vector<expr_t> dNodes; vector<expr_t> dNodes;
for (int i = 0; i < (int) dargs.size(); i++) for (int i = 0; i < (int) dargs.size(); i++)
if (dargs.at(i) != 0) dNodes.push_back(datatree.AddTimes(dargs.at(i),
dNodes.push_back(datatree.AddTimes(dargs.at(i), datatree.AddFirstDerivExternalFunctionNode(symb_id, arguments, i+1)));
datatree.AddFirstDerivExternalFunctionNode(symb_id, arguments, i+1)));
expr_t theDeriv = datatree.Zero; expr_t theDeriv = datatree.Zero;
for (vector<expr_t>::const_iterator it = dNodes.begin(); it != dNodes.end(); it++) for (vector<expr_t>::const_iterator it = dNodes.begin(); it != dNodes.end(); it++)
@ -4911,9 +4910,8 @@ FirstDerivExternalFunctionNode::composeDerivatives(const vector<expr_t> &dargs)
{ {
vector<expr_t> dNodes; vector<expr_t> dNodes;
for (int i = 0; i < (int) dargs.size(); i++) for (int i = 0; i < (int) dargs.size(); i++)
if (dargs.at(i) != 0) dNodes.push_back(datatree.AddTimes(dargs.at(i),
dNodes.push_back(datatree.AddTimes(dargs.at(i), datatree.AddSecondDerivExternalFunctionNode(symb_id, arguments, inputIndex, i+1)));
datatree.AddSecondDerivExternalFunctionNode(symb_id, arguments, inputIndex, i+1)));
expr_t theDeriv = datatree.Zero; expr_t theDeriv = datatree.Zero;
for (vector<expr_t>::const_iterator it = dNodes.begin(); it != dNodes.end(); it++) for (vector<expr_t>::const_iterator it = dNodes.begin(); it != dNodes.end(); it++)
theDeriv = datatree.AddPlus(theDeriv, *it); theDeriv = datatree.AddPlus(theDeriv, *it);