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

trunk preprocessor: added two more symbolic simplication rules, particularly useful for the static model 

* x-x=0
* x/x=1


git-svn-id: https://www.dynare.org/svn/dynare/trunk@2640 ac1d8469-bf42-47a9-8791-bf33cf982152
time-shift
sebastien 2009-04-28 16:04:29 +00:00
parent 76c426b76a
commit a7e32f5025
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
preprocessor/DataTree.cc
View File

@ -112,14 +112,16 @@ DataTree::AddPlus(NodeID iArg1, NodeID iArg2)
NodeID NodeID
DataTree::AddMinus(NodeID iArg1, NodeID iArg2) DataTree::AddMinus(NodeID iArg1, NodeID iArg2)
{ {
if (iArg1 != Zero && iArg2 != Zero) if (iArg2 == Zero)
return AddBinaryOp(iArg1, oMinus, iArg2);
else if (iArg1 != Zero)
return iArg1; return iArg1;
else if (iArg2 != Zero)
if (iArg1 == Zero)
return AddUMinus(iArg2); return AddUMinus(iArg2);
else
if (iArg1 == iArg2)
return Zero; return Zero;
return AddBinaryOp(iArg1, oMinus, iArg2);
} }
NodeID NodeID
@ -170,17 +172,23 @@ DataTree::AddTimes(NodeID iArg1, NodeID iArg2)
NodeID NodeID
DataTree::AddDivide(NodeID iArg1, NodeID iArg2) DataTree::AddDivide(NodeID iArg1, NodeID iArg2)
{ {
if (iArg1 != Zero && iArg2 != Zero && iArg2 != One) if (iArg2 == One)
return AddBinaryOp(iArg1, oDivide, iArg2);
else if (iArg2 == One)
return iArg1; return iArg1;
else if (iArg1 == Zero && iArg2 != Zero)
return Zero; // This test should be before the next two, otherwise 0/0 won't be rejected
else if (iArg2 == Zero)
{ {
cerr << "Division by zero!" << endl; cerr << "ERROR: Division by zero!" << endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (iArg1 == Zero)
return Zero;
if (iArg1 == iArg2)
return One;
return AddBinaryOp(iArg1, oDivide, iArg2);
} }
NodeID NodeID
@ -250,7 +258,7 @@ DataTree::AddLog(NodeID iArg1)
return Zero; return Zero;
else else
{ {
cerr << "log(0) isn't available" << endl; cerr << "ERROR: log(0) not defined!" << endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
@ -263,7 +271,7 @@ NodeID DataTree::AddLog10(NodeID iArg1)
return Zero; return Zero;
else else
{ {
cerr << "log10(0) isn't available" << endl; cerr << "ERROR: log10(0) not defined!" << endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }