diff --git a/src/DataTree.cc b/src/DataTree.cc index 49303d68f4d3f5b125fed238e421d3f92862750e..6deb8b797e2b829c5bc5ee9420105f8a56f3f501 100644 --- a/src/DataTree.cc +++ b/src/DataTree.cc @@ -1,5 +1,5 @@ /* - * Copyright © 2003-2023 Dynare Team + * Copyright © 2003-2024 Dynare Team * * This file is part of Dynare. * @@ -842,8 +842,8 @@ DataTree::addAllParamDerivId([[maybe_unused]] set<int>& deriv_id_set) bool DataTree::isUnaryOpUsed(UnaryOpcode opcode) const { - return any_of(unary_op_node_map.begin(), unary_op_node_map.end(), - [=](const auto& it) { return get<1>(it.first) == opcode; }); + return ranges::any_of(unary_op_node_map, + [=](const auto& it) { return get<1>(it.first) == opcode; }); } bool @@ -863,8 +863,8 @@ DataTree::isUnaryOpUsedOnType(SymbolType type, UnaryOpcode opcode) const bool DataTree::isBinaryOpUsed(BinaryOpcode opcode) const { - return any_of(binary_op_node_map.begin(), binary_op_node_map.end(), - [=](const auto& it) { return get<2>(it.first) == opcode; }); + return ranges::any_of(binary_op_node_map, + [=](const auto& it) { return get<2>(it.first) == opcode; }); } bool diff --git a/src/ExprNode.cc b/src/ExprNode.cc index 35e83b316418f20b438970a7bea26994411d21fc..e72e446cd9e4d766aedaeafd637bd6c5e0865073 100644 --- a/src/ExprNode.cc +++ b/src/ExprNode.cc @@ -7270,15 +7270,15 @@ AbstractExternalFunctionNode::isVariableNodeEqualTo([[maybe_unused]] SymbolType bool AbstractExternalFunctionNode::containsPacExpectation(const string& pac_model_name) const { - return any_of(arguments.begin(), arguments.end(), - [&](expr_t e) { return e->containsPacExpectation(pac_model_name); }); + return ranges::any_of(arguments, + [&](expr_t e) { return e->containsPacExpectation(pac_model_name); }); } bool AbstractExternalFunctionNode::containsPacTargetNonstationary(const string& pac_model_name) const { - return any_of(arguments.begin(), arguments.end(), - [&](expr_t e) { return e->containsPacTargetNonstationary(pac_model_name); }); + return ranges::any_of( + arguments, [&](expr_t e) { return e->containsPacTargetNonstationary(pac_model_name); }); } expr_t diff --git a/src/SymbolTable.cc b/src/SymbolTable.cc index 94045162ae2fc4e8147163285caf0a085e6b7a2b..c46f2458dc0c97bcc3ebc5316cf6c598262f7085 100644 --- a/src/SymbolTable.cc +++ b/src/SymbolTable.cc @@ -1,5 +1,5 @@ /* - * Copyright © 2003-2023 Dynare Team + * Copyright © 2003-2024 Dynare Team * * This file is part of Dynare. * @@ -895,14 +895,13 @@ SymbolTable::getEndogenous() const bool SymbolTable::isAuxiliaryVariable(int symb_id) const { - return any_of(aux_vars.begin(), aux_vars.end(), - [=](const auto& av) { return av.symb_id == symb_id; }); + return ranges::any_of(aux_vars, [=](const auto& av) { return av.symb_id == symb_id; }); } bool SymbolTable::isDiffAuxiliaryVariable(int symb_id) const { - return any_of(aux_vars.begin(), aux_vars.end(), [=](const auto& av) { + return ranges::any_of(aux_vars, [=](const auto& av) { return av.symb_id == symb_id && (av.type == AuxVarType::diff || av.type == AuxVarType::diffLag || av.type == AuxVarType::diffLead);