Fix coverity hits in classifier and Decision Forest

uxlfoundation · Dec 3, 2024 · 6efef0e · 6efef0e
1 parent 32d72e3
commit 6efef0e
Show file tree

Hide file tree

Showing 19 changed files with 93 additions and 42 deletions.
diff --git a/cpp/daal/include/algorithms/classifier/binary_confusion_matrix_types.h b/cpp/daal/include/algorithms/classifier/binary_confusion_matrix_types.h
@@ -115,6 +115,8 @@ namespace interface1
 struct DAAL_EXPORT Parameter : public daal::algorithms::Parameter
 {
     Parameter(double beta = 1.0);
+    Parameter(const Parameter & other) = default;
+    Parameter & operator=(const Parameter & other) = default;
     virtual ~Parameter() {}
 
     double beta; /*!< Parameter of the F-score */
@@ -132,6 +134,7 @@ class DAAL_EXPORT Input : public daal::algorithms::Input
 public:
     Input();
     Input(const Input & other) : daal::algorithms::Input(other) {}
+    Input & operator=(const Input & other) = default;
 
     virtual ~Input() {}
 

diff --git a/cpp/daal/include/algorithms/classifier/classifier_model.h b/cpp/daal/include/algorithms/classifier/classifier_model.h
@@ -97,6 +97,10 @@ class DAAL_EXPORT Model : public daal::algorithms::Model
 public:
     DAAL_CAST_OPERATOR(Model)
 
+    Model() = default;
+    Model(const Model & other) = default;
+    Model & operator=(const Model & other) = default;
+
     virtual ~Model() DAAL_C11_OVERRIDE {}
 
     /**

diff --git a/cpp/daal/include/algorithms/classifier/classifier_predict_types.h b/cpp/daal/include/algorithms/classifier/classifier_predict_types.h
@@ -95,11 +95,7 @@ class DAAL_EXPORT InputIface : public daal::algorithms::Input
 public:
     InputIface(size_t nElements);
     InputIface(const InputIface & other) : daal::algorithms::Input(other) {}
-    InputIface & operator=(const InputIface & other)
-    {
-        daal::algorithms::Input::operator=(other);
-        return *this;
-    }
+    InputIface & operator=(const InputIface & other) = default;
     virtual ~InputIface() {}
     /**
      * Returns the number of rows in the input data set
@@ -117,8 +113,7 @@ class DAAL_EXPORT Input : public InputIface
 public:
     Input();
     Input(const Input & other) : InputIface(other) {}
-    Input & operator=(const Input & other);
-
+    Input & operator=(const Input & other) = default;
     virtual ~Input() {}
 
     /**

diff --git a/cpp/daal/include/algorithms/classifier/classifier_training_types.h b/cpp/daal/include/algorithms/classifier/classifier_training_types.h
@@ -99,11 +99,7 @@ class DAAL_EXPORT InputIface : public daal::algorithms::Input
 public:
     InputIface(size_t nElements);
     InputIface(const InputIface & other) : daal::algorithms::Input(other) {}
-    InputIface & operator=(const InputIface & other)
-    {
-        daal::algorithms::Input::operator=(other);
-        return *this;
-    }
+    InputIface & operator=(const InputIface & other) = default;
     virtual ~InputIface() {}
     virtual size_t getNumberOfFeatures() const = 0;
 };
@@ -117,7 +113,7 @@ class DAAL_EXPORT Input : public InputIface
 public:
     Input(size_t nElements = lastInputId + 1);
     Input(const Input & other) : InputIface(other) {}
-    Input & operator=(const Input & other);
+    Input & operator=(const Input & other) = default;
 
     virtual ~Input() {}
 

diff --git a/cpp/daal/include/algorithms/classifier/multiclass_confusion_matrix_types.h b/cpp/daal/include/algorithms/classifier/multiclass_confusion_matrix_types.h
@@ -111,6 +111,8 @@ namespace interface1
 struct DAAL_EXPORT Parameter : public daal::algorithms::Parameter
 {
     Parameter(size_t nClasses = 0, double beta = 1.0);
+    Parameter(const Parameter & other) = default;
+    Parameter & operator=(const Parameter & other) = default;
     virtual ~Parameter() {}
 
     size_t nClasses; /*!< Number of classes */
@@ -129,6 +131,7 @@ class DAAL_EXPORT Input : public daal::algorithms::Input
 public:
     Input();
     Input(const Input & other) : daal::algorithms::Input(other) {}
+    Input & operator=(const Input & other) = default;
 
     virtual ~Input() {}
 

diff --git a/cpp/daal/include/algorithms/decision_forest/decision_forest_classification_predict_types.h b/cpp/daal/include/algorithms/decision_forest/decision_forest_classification_predict_types.h
@@ -73,6 +73,7 @@ class DAAL_EXPORT Input : public classifier::prediction::Input
 public:
     Input();
     Input(const Input & other) : super(other) {}
+    Input & operator=(const Input & other) = default;
     virtual ~Input() {}
 
     using super::get;

diff --git a/cpp/daal/include/algorithms/decision_forest/decision_forest_regression_predict_types.h b/cpp/daal/include/algorithms/decision_forest/decision_forest_regression_predict_types.h
@@ -106,6 +106,7 @@ class DAAL_EXPORT Input : public algorithms::regression::prediction::Input
 public:
     Input();
     Input(const Input & other);
+    Input & operator=(const Input & other) = default;
 
     /**
      * Returns an input object for making decision forest model-based prediction

diff --git a/cpp/daal/include/algorithms/decision_forest/decision_forest_regression_training_types.h b/cpp/daal/include/algorithms/decision_forest/decision_forest_regression_training_types.h
@@ -154,6 +154,8 @@ class DAAL_EXPORT Input : public algorithms::regression::training::Input
     /** Copy constructor */
     Input(const Input & other) : algorithms::regression::training::Input(other) {}
 
+    Input & operator=(const Input & other) = default;
+
     virtual ~Input() {};
 
     /**

diff --git a/cpp/daal/include/algorithms/gradient_boosted_trees/gbt_classification_predict_types.h b/cpp/daal/include/algorithms/gradient_boosted_trees/gbt_classification_predict_types.h
@@ -107,6 +107,7 @@ struct DAAL_EXPORT Parameter : public daal::algorithms::classifier::Parameter
 
     Parameter(size_t nClasses = 2) : super(nClasses), nIterations(0), resultsToCompute(predictionResult) {}
     Parameter(const Parameter & o) : super(o), nIterations(o.nIterations), resultsToCompute(o.resultsToCompute) {}
+    Parameter & operator=(const Parameter & o) = default;
     size_t nIterations;           /*!< Number of iterations of the trained model to be used for prediction */
     DAAL_UINT64 resultsToCompute; /*!< 64 bit integer flag that indicates the results to compute */
 };
@@ -185,7 +186,7 @@ class DAAL_EXPORT Input : public classifier::prediction::Input
 public:
     Input() : super() {}
     Input(const Input & other) : super(other) {}
-    Input & operator=(const Input & other);
+    Input & operator=(const Input & other) = default;
     virtual ~Input() {}
 
     using super::get;

diff --git a/cpp/daal/include/algorithms/gradient_boosted_trees/gbt_regression_predict_types.h b/cpp/daal/include/algorithms/gradient_boosted_trees/gbt_regression_predict_types.h
@@ -119,6 +119,7 @@ struct DAAL_EXPORT Parameter : public daal::algorithms::Parameter
 
     Parameter() : super(), nIterations(0), resultsToCompute(predictionResult) {}
     Parameter(const Parameter & o) : super(o), nIterations(o.nIterations), resultsToCompute(o.resultsToCompute) {}
+    Parameter & operator=(const Parameter & o) = default;
     size_t nIterations;           /*!< Number of iterations of the trained model to be uses for prediction*/
     DAAL_UINT64 resultsToCompute; /*!< 64 bit integer flag that indicates the results to compute */
 };
@@ -132,8 +133,8 @@ class DAAL_EXPORT Input : public algorithms::regression::prediction::Input
 {
 public:
     Input();
-    Input(const Input & other);
-    Input & operator=(const Input & other);
+    Input(const Input & other) = default;
+    Input & operator=(const Input & other) = default;
     virtual ~Input() {}
 
     /**

diff --git a/cpp/daal/include/algorithms/multi_class_classifier/multi_class_classifier_model.h b/cpp/daal/include/algorithms/multi_class_classifier/multi_class_classifier_model.h
@@ -127,6 +127,9 @@ class DAAL_EXPORT Model : public daal::algorithms::classifier::Model
      */
     Model();
 
+    Model(const Model & other);
+    Model & operator=(const Model & other);
+
     /**
      * Constructs multi-class classifier model
      * \param[in] nFeatures Number of features in the dataset

diff --git a/cpp/daal/src/algorithms/classifier/classifier_predict.cpp b/cpp/daal/src/algorithms/classifier/classifier_predict.cpp
@@ -39,12 +39,6 @@ InputIface::InputIface(size_t nElements) : daal::algorithms::Input(nElements) {}
 
 Input::Input() : InputIface(lastModelInputId + 1) {}
 
-Input & Input::operator=(const Input & other)
-{
-    InputIface::operator=(other);
-    return *this;
-}
-
 /**
  * Returns the number of rows in the input data set
  * \return Number of rows in the input data set

diff --git a/cpp/daal/src/algorithms/classifier/classifier_train.cpp b/cpp/daal/src/algorithms/classifier/classifier_train.cpp
@@ -54,12 +54,6 @@ __DAAL_REGISTER_SERIALIZATION_CLASS(Result, SERIALIZATION_CLASSIFIER_TRAINING_RE
 InputIface::InputIface(size_t nElements) : daal::algorithms::Input(nElements) {}
 Input::Input(size_t nElements) : InputIface(nElements) {}
 
-Input & Input::operator=(const Input & other)
-{
-    InputIface::operator=(other);
-    return *this;
-}
-
 size_t Input::getNumberOfFeatures() const
 {
     return get(classifier::training::data)->getNumberOfColumns();

diff --git a/cpp/daal/src/algorithms/dtrees/dtrees_model.cpp b/cpp/daal/src/algorithms/dtrees/dtrees_model.cpp
@@ -38,6 +38,39 @@ Tree::~Tree() {}
 
 ModelImpl::ModelImpl() : _nTree(0) {}
 
+ModelImpl::ModelImpl(const ModelImpl & other)
+{
+    const size_t nTree = other._nTree.get();
+    resize(nTree); // sets _nTree = 0
+    _nTree.set(nTree);
+    for (size_t i = 0; i < nTree; ++i)
+    {
+        (*_serializationData)[i] = (*other._serializationData)[i];
+        (*_impurityTables)[i] = (*other._impurityTables)[i];
+        (*_nNodeSampleTables)[i] = (*other._nNodeSampleTables)[i];
+        (*_probTbl)[i] = (*other._probTbl)[i];
+    }
+}
+
+ModelImpl & ModelImpl::operator=(const ModelImpl & other)
+{
+    if (this != &other)
+    {
+        destroy();
+        const size_t nTree = other._nTree.get();
+        resize(nTree); // sets _nTree = 0
+        _nTree.set(nTree);
+        for (size_t i = 0; i < nTree; ++i)
+        {
+            (*_serializationData)[i] = (*other._serializationData)[i];
+            (*_impurityTables)[i] = (*other._impurityTables)[i];
+            (*_nNodeSampleTables)[i] = (*other._nNodeSampleTables)[i];
+            (*_probTbl)[i] = (*other._probTbl)[i];
+        }
+    }
+    return *this;
+}
+
 ModelImpl::~ModelImpl()
 {
     destroy();

diff --git a/cpp/daal/src/algorithms/dtrees/dtrees_model_impl.h b/cpp/daal/src/algorithms/dtrees/dtrees_model_impl.h
@@ -480,8 +480,9 @@ class DAAL_EXPORT ModelImpl
 {
 public:
     ModelImpl();
-    ModelImpl(const ModelImpl &)                   = delete;
-    ModelImpl & operator=(const ModelImpl & other) = delete;
+
+    ModelImpl(const ModelImpl & other);
+    ModelImpl & operator=(const ModelImpl & other);
 
     virtual ~ModelImpl();
 

diff --git a/cpp/daal/src/algorithms/dtrees/gbt/classification/gbt_classification_predict_types.cpp b/cpp/daal/src/algorithms/dtrees/gbt/classification/gbt_classification_predict_types.cpp
@@ -42,12 +42,6 @@ namespace prediction
 {
 namespace interface1
 {
-Input & Input::operator=(const Input & other)
-{
-    algorithms::classifier::prediction::Input::operator=(other);
-    return *this;
-}
-
 /**
  * Returns an input object for making gradient boosted trees model-based prediction
  * \param[in] id    Identifier of the input object

diff --git a/cpp/daal/src/algorithms/dtrees/gbt/gbt_model_impl.h b/cpp/daal/src/algorithms/dtrees/gbt/gbt_model_impl.h
@@ -312,6 +312,10 @@ class ModelImpl : protected dtrees::internal::ModelImpl
     using TreeType = gbt::internal::TreeImpRegression<>;
     using super    = dtrees::internal::ModelImpl;
 
+    ModelImpl() = default;
+    ModelImpl(const ModelImpl & other) = default;
+    ModelImpl & operator=(const ModelImpl & other) = default;
+
     ~ModelImpl() DAAL_C11_OVERRIDE;
     size_t size() const;
     bool reserve(const size_t nTrees);

diff --git a/cpp/daal/src/algorithms/dtrees/gbt/regression/gbt_regression_predict_types.cpp b/cpp/daal/src/algorithms/dtrees/gbt/regression/gbt_regression_predict_types.cpp
@@ -47,12 +47,6 @@ __DAAL_REGISTER_SERIALIZATION_CLASS(Result, SERIALIZATION_DECISION_FOREST_REGRES
 Input::Input() : algorithms::regression::prediction::Input(lastModelInputId + 1) {}
 Input::Input(const Input & other) : algorithms::regression::prediction::Input(other) {}
 
-Input & Input::operator=(const Input & other)
-{
-    algorithms::regression::prediction::Input::operator=(other);
-    return *this;
-}
-
 /**
  * Returns an input object for making gradient boosted trees model-based prediction
  * \param[in] id    Identifier of the input object

diff --git a/cpp/daal/src/algorithms/multiclassclassifier/multiclassclassifier_model.cpp b/cpp/daal/src/algorithms/multiclassclassifier/multiclassclassifier_model.cpp
@@ -46,6 +46,33 @@ Model::Model(size_t nFeatures, const multi_class_classifier::interface2::Paramet
     if (!_models) st.add(services::ErrorMemoryAllocationFailed);
 }
 
+Model::Model(const Model & other) :
+    _nFeatures(other._nFeatures),
+    _models(new data_management::DataCollection(other.getNumberOfTwoClassClassifierModels())),
+    _modelsArray(nullptr)
+{
+    const size_t nModels = other.getNumberOfTwoClassClassifierModels();
+    for (size_t i = 0; i < nModels; ++i)
+    {
+        setTwoClassClassifierModel(i, other.getTwoClassClassifierModel(i));
+    }
+}
+
+Model & Model::operator=(const Model & other)
+{
+    if (this != &other)
+    {
+        _nFeatures = other._nFeatures;
+        const size_t nModels = other.getNumberOfTwoClassClassifierModels();
+        _models = data_management::DataCollectionPtr(new data_management::DataCollection(nModels));
+        for (size_t i = 0; i < nModels; ++i)
+        {
+            setTwoClassClassifierModel(i, other.getTwoClassClassifierModel(i));
+        }
+    }
+    return *this;
+}
+
 Model::Model() : _nFeatures(0), _models(new data_management::DataCollection()), _modelsArray(nullptr) {}
 
 ModelPtr Model::create(size_t nFeatures, const multi_class_classifier::interface2::ParameterBase * par, services::Status * stat)