xfygogo/exprtk
1
0
Fork 0
mirror of https://github.com/ArashPartow/exprtk.git synced 2025-06-12 16:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

C++ Mathematical Expression Library (ExprTk) http://www.partow.net/programming/exprtk/index.html

Browse Source
This commit is contained in:
Arash Partow
2014-11-12 07:01:09 +11:00
parent d068f6e14b
commit 0392927ab3
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
exprtk.hpp
View File

@ -5080,8 +5080,10 @@ namespace exprtk
{
if (1 != (arg_list.size() & 1))
return;
arg_list_.resize(arg_list.size());
delete_branch_.resize(arg_list.size());
for (std::size_t i = 0; i < arg_list.size(); ++i)
{
if (arg_list[i])
@ -5114,22 +5116,20 @@ namespace exprtk
{
if (!arg_list_.empty())
{
if (1 != (arg_list_.size() & 1))
{
return std::numeric_limits<T>::quiet_NaN();
}
const std::size_t upper_bound = (arg_list_.size() - 1);
for (std::size_t i = 0; i < arg_list_.size() / 2; ++i)
for (std::size_t i = 0; i < upper_bound; i += 2)
{
expression_ptr condition = arg_list_[(2 * i) ];
expression_ptr consequent = arg_list_[(2 * i) + 1];
expression_ptr condition = arg_list_[i ];
expression_ptr consequent = arg_list_[i + 1];
if (is_true(condition))
{
return consequent->value();
}
}
return arg_list_.back()->value();
return arg_list_[upper_bound]->value();
}
else
return std::numeric_limits<T>::quiet_NaN();