diff --git a/src/descriptor_identifier/model/Model.hpp b/src/descriptor_identifier/model/Model.hpp index 45805f3d0ceb8d8bc472a5dcea89a32cac156772..5a26eddb3317829c576c9e8d042984b8bdc14c9f 100644 --- a/src/descriptor_identifier/model/Model.hpp +++ b/src/descriptor_identifier/model/Model.hpp @@ -845,8 +845,9 @@ template <class ModelBase = Model> class PyModel : public ModelBase { using ModelBase::ModelBase; + using Model::error_summary_string; - std::string error_summary_string(std::vector<double> prop, std::vector<double> prop_est) + std::string error_summary_string(std::vector<double> prop, std::vector<double> prop_est) const override { PYBIND11_OVERRIDE_PURE(std::string, ModelBase, error_summary_string, prop, prop_est); } diff --git a/src/descriptor_identifier/model/ModelClassifier.hpp b/src/descriptor_identifier/model/ModelClassifier.hpp index d4c1e572dd1cd0144934be625579c1920276e051..d2420e124ea9e4c8490c32ee74c2d3e9f5b9e35b 100644 --- a/src/descriptor_identifier/model/ModelClassifier.hpp +++ b/src/descriptor_identifier/model/ModelClassifier.hpp @@ -339,7 +339,7 @@ class PyModelClassifier : public PyModel<ModelClassifierBase> { using PyModel<ModelClassifierBase>::PyModel; // Inherit constructors - std::string error_summary_string(std::vector<double> prop, std::vector<double> prop_est) + std::string error_summary_string(std::vector<double> prop, std::vector<double> prop_est) const override { PYBIND11_OVERRIDE(std::string, ModelClassifierBase, error_summary_string, prop, prop_est); } diff --git a/src/descriptor_identifier/model/ModelLogRegressor.hpp b/src/descriptor_identifier/model/ModelLogRegressor.hpp index ed6cb2d49f43c39a3d4ce2678240ed27b9d2b96b..348881ae8f3adf9a1429a2be62f0b5d21457e2a5 100644 --- a/src/descriptor_identifier/model/ModelLogRegressor.hpp +++ b/src/descriptor_identifier/model/ModelLogRegressor.hpp @@ -32,6 +32,7 @@ class ModelLogRegressor : public ModelRegressor { public: using Model::eval; + using ModelRegressor::error_summary_string; /** * @brief Default constructor diff --git a/src/descriptor_identifier/model/ModelRegressor.hpp b/src/descriptor_identifier/model/ModelRegressor.hpp index e576ef9611a7c65e3e08b2b4a0050a66d9886879..9c96223d04e45e6c215c301cd3559079c375e5a2 100644 --- a/src/descriptor_identifier/model/ModelRegressor.hpp +++ b/src/descriptor_identifier/model/ModelRegressor.hpp @@ -461,8 +461,9 @@ template <class ModelRegressorBase = ModelRegressor> class PyModelRegressor : public PyModel<ModelRegressorBase> { using PyModel<ModelRegressorBase>::PyModel; // Inherit constructors + using ModelRegressor::error_summary_string; - std::string error_summary_string(std::vector<double> prop, std::vector<double> prop_est) + std::string error_summary_string(std::vector<double> prop, std::vector<double> prop_est) const override { PYBIND11_OVERRIDE(std::string, ModelRegressorBase, error_summary_string, prop, prop_est); } diff --git a/src/feature_creation/node/FeatureNode.hpp b/src/feature_creation/node/FeatureNode.hpp index 8e09903ffb8683b402fec211a5f46a8c6ed973c3..a0845f4d905f70e06fd428d99048ea2558da0de5 100644 --- a/src/feature_creation/node/FeatureNode.hpp +++ b/src/feature_creation/node/FeatureNode.hpp @@ -57,6 +57,12 @@ class FeatureNode : public Node ar& _test_value; } + using Node::get_latex_expr; + using Node::set_value; + using Node::set_test_value; + using Node::value_ptr; + using Node::test_value_ptr; + protected: // clang-format off std::vector<double> _value; //!< The value for this feature's training data @@ -576,6 +582,14 @@ template <class FeatureNodeBase = FeatureNode> class PyFeatureNode : public PyNode<FeatureNodeBase> { using PyNode<FeatureNodeBase>::PyNode; // Inherit constructors + using FeatureNode::value_ptr; + using FeatureNode::test_value_ptr; + using FeatureNode::get_latex_expr; + using FeatureNode::set_value; + using FeatureNode::set_test_value; + using FeatureNode::expr; + using FeatureNode::matlab_fxn_expr; + using FeatureNode::domain; std::shared_ptr<Node> hard_copy() const override { diff --git a/src/feature_creation/node/ModelNode.hpp b/src/feature_creation/node/ModelNode.hpp index 306875fd2982011b9cf0301c961676ee6db06218..0e2b8ff07559046676d0a5a8de86afefb693830c 100644 --- a/src/feature_creation/node/ModelNode.hpp +++ b/src/feature_creation/node/ModelNode.hpp @@ -62,6 +62,11 @@ class ModelNode : public FeatureNode ar& _n_leaves; } + using FeatureNode::get_latex_expr; + using FeatureNode::set_value; + using FeatureNode::set_test_value; + using FeatureNode::value_ptr; + using FeatureNode::test_value_ptr; protected: // clang-format off std::vector<double> _value_svm; //!< Value of the feature converted to a range of -1.0 to 1.0 diff --git a/src/feature_creation/node/operator_nodes/OperatorNode.hpp b/src/feature_creation/node/operator_nodes/OperatorNode.hpp index 43c3927585f00988c626ec3ff805805aee452744..edaa21e7bfc94107e31a2e2fc9049384a721b506 100644 --- a/src/feature_creation/node/operator_nodes/OperatorNode.hpp +++ b/src/feature_creation/node/operator_nodes/OperatorNode.hpp @@ -66,6 +66,8 @@ class OperatorNode : public Node ar& _feats; } + using Node::expr; + protected: // clang-format off std::array<node_ptr, N> _feats; //!< The features for the operator nodes to act on (This Node's children)