rename IndexedFeatures::min method into featureMin

uxlfoundation · Sep 24, 2024 · 4b74e79 · 4b74e79
1 parent 98c0ca0
commit 4b74e79
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/cpp/daal/src/algorithms/dtrees/dtrees_feature_type_helper.h b/cpp/daal/src/algorithms/dtrees/dtrees_feature_type_helper.h
@@ -138,7 +138,7 @@ class IndexedFeatures
     }
 
     //returns right border of the bin if the feature is a binned one
-    ModelFPType min(size_t iCol) const
+    ModelFPType featureMin(size_t iCol) const
     {
         DAAL_ASSERT(isBinned(iCol));
         return _entries[iCol].min;

diff --git a/.../src/algorithms/dtrees/forest/classification/df_classification_train_dense_default_impl.i b/.../src/algorithms/dtrees/forest/classification/df_classification_train_dense_default_impl.i
@@ -1010,7 +1010,7 @@ size_t UnorderedRespHelperRandom<algorithmFPType, cpu>::genRandomBinIdx(const In
 {
     //randomly select a histogram split index
     algorithmFPType fidx   = 0;
-    algorithmFPType minval = minidx ? this->indexedFeatures().binRightBorder(iFeature, minidx - 1) : this->indexedFeatures().min(iFeature);
+    algorithmFPType minval = minidx ? this->indexedFeatures().binRightBorder(iFeature, minidx - 1) : this->indexedFeatures().featureMin(iFeature);
     algorithmFPType maxval = this->indexedFeatures().binRightBorder(iFeature, maxidx);
     size_t mid;
     size_t l   = minidx;

diff --git a/cpp/daal/src/algorithms/dtrees/forest/regression/df_regression_train_dense_default_impl.i b/cpp/daal/src/algorithms/dtrees/forest/regression/df_regression_train_dense_default_impl.i
@@ -857,7 +857,7 @@ size_t OrderedRespHelperRandom<algorithmFPType, cpu>::genRandomBinIdx(const Inde
 {
     //randomly select a histogram split index
     algorithmFPType fidx   = 0;
-    algorithmFPType minval = minidx ? this->indexedFeatures().binRightBorder(iFeature, minidx - 1) : this->indexedFeatures().min(iFeature);
+    algorithmFPType minval = minidx ? this->indexedFeatures().binRightBorder(iFeature, minidx - 1) : this->indexedFeatures().featureMin(iFeature);
     algorithmFPType maxval = this->indexedFeatures().binRightBorder(iFeature, maxidx);
     size_t mid;
     size_t l   = minidx;

diff --git a/cpp/daal/src/algorithms/k_nearest_neighbors/kdtree_knn_impl.i b/cpp/daal/src/algorithms/k_nearest_neighbors/kdtree_knn_impl.i
@@ -51,18 +51,6 @@ namespace internal
 
 #define __KDTREE_NULLDIMENSION (static_cast<size_t>(-1))
 
-template <CpuType cpu, typename T>
-inline const T & min(const T & a, const T & b)
-{
-    return !(b < a) ? a : b;
-}
-
-template <CpuType cpu, typename T>
-inline const T & max(const T & a, const T & b)
-{
-    return (a < b) ? b : a;
-}
-
 template <typename T, CpuType cpu>
 class Stack
 {