diff --git a/src/ExprNode.cc b/src/ExprNode.cc index b4e88c01..556f0efd 100644 --- a/src/ExprNode.cc +++ b/src/ExprNode.cc @@ -638,12 +638,6 @@ NumConstNode::containsExogenous() const return false; } -bool -NumConstNode::containsParameter() const -{ - return false; -} - expr_t NumConstNode::replaceTrendVar() const { @@ -1883,12 +1877,6 @@ VariableNode::containsExogenous() const return (get_type() == SymbolType::exogenous || get_type() == SymbolType::exogenousDet); } -bool -VariableNode::containsParameter() const -{ - return get_type() == SymbolType::parameter ? true : false; -} - expr_t VariableNode::replaceTrendVar() const { @@ -3768,12 +3756,6 @@ UnaryOpNode::containsExogenous() const return arg->containsExogenous(); } -bool -UnaryOpNode::containsParameter() const -{ - return arg->containsParameter(); -} - expr_t UnaryOpNode::replaceTrendVar() const { @@ -5465,12 +5447,6 @@ BinaryOpNode::containsExogenous() const return (arg1->containsExogenous() || arg2->containsExogenous()); } -bool -BinaryOpNode::containsParameter() const -{ - return (arg1->containsParameter() || arg2->containsParameter()); -} - expr_t BinaryOpNode::replaceTrendVar() const { @@ -6764,12 +6740,6 @@ TrinaryOpNode::containsExogenous() const return (arg1->containsExogenous() || arg2->containsExogenous() || arg3->containsExogenous()); } -bool -TrinaryOpNode::containsParameter() const -{ - return (arg1->containsParameter() || arg2->containsParameter() || arg3->containsParameter()); -} - expr_t TrinaryOpNode::replaceTrendVar() const { @@ -7340,15 +7310,6 @@ AbstractExternalFunctionNode::containsExogenous() const return false; } -bool -AbstractExternalFunctionNode::containsParameter() const -{ - for (auto argument : arguments) - if (argument->containsParameter()) - return true; - return false; -} - expr_t AbstractExternalFunctionNode::replaceTrendVar() const { @@ -8969,13 +8930,6 @@ VarExpectationNode::containsExogenous() const exit(EXIT_FAILURE); } -bool -VarExpectationNode::containsParameter() const -{ - cerr << "VarExpectationNode::containsParameter not implemented." << endl; - exit(EXIT_FAILURE); -} - bool VarExpectationNode::isNumConstNodeEqualTo(double value) const { @@ -9532,12 +9486,6 @@ PacExpectationNode::containsExogenous() const return false; } -bool -PacExpectationNode::containsParameter() const -{ - return false; -} - bool PacExpectationNode::isNumConstNodeEqualTo(double value) const { diff --git a/src/ExprNode.hh b/src/ExprNode.hh index ef7bdfd8..df57b822 100644 --- a/src/ExprNode.hh +++ b/src/ExprNode.hh @@ -526,9 +526,6 @@ class ExprNode //! Returns true if the expression contains one or several exogenous variable virtual bool containsExogenous() const = 0; - //! Returns true if the expression contains one or several parameters - virtual bool containsParameter() const = 0; - //! Returns the maximum number of nested diffs in the expression virtual int countDiffs() const = 0; @@ -724,7 +721,6 @@ public: bool isNumConstNodeEqualTo(double value) const override; bool containsEndogenous() const override; bool containsExogenous() const override; - bool containsParameter() const override; int countDiffs() const override; bool isVariableNodeEqualTo(SymbolType type_arg, int variable_id, int lag_arg) const override; expr_t replaceTrendVar() const override; @@ -816,7 +812,6 @@ public: bool isNumConstNodeEqualTo(double value) const override; bool containsEndogenous() const override; bool containsExogenous() const override; - bool containsParameter() const override; int countDiffs() const override; bool isVariableNodeEqualTo(SymbolType type_arg, int variable_id, int lag_arg) const override; expr_t replaceTrendVar() const override; @@ -936,7 +931,6 @@ public: bool isNumConstNodeEqualTo(double value) const override; bool containsEndogenous() const override; bool containsExogenous() const override; - bool containsParameter() const override; int countDiffs() const override; bool isVariableNodeEqualTo(SymbolType type_arg, int variable_id, int lag_arg) const override; expr_t replaceTrendVar() const override; @@ -1063,7 +1057,6 @@ public: bool isNumConstNodeEqualTo(double value) const override; bool containsEndogenous() const override; bool containsExogenous() const override; - bool containsParameter() const override; int countDiffs() const override; bool isVariableNodeEqualTo(SymbolType type_arg, int variable_id, int lag_arg) const override; expr_t replaceTrendVar() const override; @@ -1191,7 +1184,6 @@ public: bool isNumConstNodeEqualTo(double value) const override; bool containsEndogenous() const override; bool containsExogenous() const override; - bool containsParameter() const override; int countDiffs() const override; bool isVariableNodeEqualTo(SymbolType type_arg, int variable_id, int lag_arg) const override; expr_t replaceTrendVar() const override; @@ -1319,7 +1311,6 @@ public: bool isNumConstNodeEqualTo(double value) const override; bool containsEndogenous() const override; bool containsExogenous() const override; - bool containsParameter() const override; int countDiffs() const override; bool isVariableNodeEqualTo(SymbolType type_arg, int variable_id, int lag_arg) const override; void writePrhs(ostream &output, ExprNodeOutputType output_type, const temporary_terms_t &temporary_terms, const temporary_terms_idxs_t &temporary_terms_idxs, const deriv_node_temp_terms_t &tef_terms, const string &ending) const; @@ -1535,7 +1526,6 @@ public: void collectDynamicVariables(SymbolType type_arg, set> &result) const override; bool containsEndogenous() const override; bool containsExogenous() const override; - bool containsParameter() const override; int countDiffs() const override; bool isNumConstNodeEqualTo(double value) const override; expr_t differentiateForwardVars(const vector &subset, subst_table_t &subst_table, vector &neweqs) const override; @@ -1638,7 +1628,6 @@ public: void collectDynamicVariables(SymbolType type_arg, set> &result) const override; bool containsEndogenous() const override; bool containsExogenous() const override; - bool containsParameter() const override; int countDiffs() const override; bool isNumConstNodeEqualTo(double value) const override; expr_t differentiateForwardVars(const vector &subset, subst_table_t &subst_table, vector &neweqs) const override;