Add template argument StatisticVector to class DenseDecomposableStati…

…stics.
mrapp-ke · Sep 13, 2024 · d2bad1b · d2bad1b
1 parent 23c1241
commit d2bad1b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/cpp/subprojects/boosting/src/mlrl/boosting/statistics/statistics_decomposable_dense.hpp b/cpp/subprojects/boosting/src/mlrl/boosting/statistics/statistics_decomposable_dense.hpp
@@ -53,11 +53,13 @@ namespace boosting {
      * @tparam OutputMatrix         The type of the matrix that provides access to the ground truth of the training
      *                              examples
      * @tparam QuantizationMatrix   The type of the matrix that provides access to quantized gradients and Hessians
+     * @tparam StatisticVector      The type of the vectors that are used to store gradients and Hessians
      * @tparam EvaluationMeasure    The type of the evaluation that should be used to access the quality of predictions
      */
-    template<typename Loss, typename OutputMatrix, typename QuantizationMatrix, typename EvaluationMeasure>
+    template<typename Loss, typename OutputMatrix, typename QuantizationMatrix, typename StatisticVector,
+             typename EvaluationMeasure>
     class DenseDecomposableStatistics final
-        : public AbstractDecomposableStatistics<OutputMatrix, QuantizationMatrix, DenseDecomposableStatisticVector,
+        : public AbstractDecomposableStatistics<OutputMatrix, QuantizationMatrix, StatisticVector,
                                                 DenseDecomposableStatisticMatrix, NumericCContiguousMatrix<float64>,
                                                 Loss, EvaluationMeasure, IDecomposableRuleEvaluationFactory> {
         public:
@@ -87,7 +89,7 @@ namespace boosting {
                                         const OutputMatrix& outputMatrix,
                                         std::unique_ptr<DenseDecomposableStatisticMatrix> statisticMatrixPtr,
                                         std::unique_ptr<NumericCContiguousMatrix<float64>> scoreMatrixPtr)
-                : AbstractDecomposableStatistics<OutputMatrix, QuantizationMatrix, DenseDecomposableStatisticVector,
+                : AbstractDecomposableStatistics<OutputMatrix, QuantizationMatrix, StatisticVector,
                                                  DenseDecomposableStatisticMatrix, NumericCContiguousMatrix<float64>,
                                                  Loss, EvaluationMeasure, IDecomposableRuleEvaluationFactory>(
                     std::move(quantizationMatrixPtr), std::move(lossPtr), std::move(evaluationMeasurePtr),

diff --git a/...projects/boosting/src/mlrl/boosting/statistics/statistics_provider_decomposable_dense.cpp b/...projects/boosting/src/mlrl/boosting/statistics/statistics_provider_decomposable_dense.cpp
@@ -36,8 +36,9 @@ namespace boosting {
         std::unique_ptr<IDecomposableStatistics<IDecomposableRuleEvaluationFactory>> statisticsPtr;
         auto denseDecomposableMatrixVisitor =
           [&](std::unique_ptr<IQuantizationMatrix<CContiguousView<Tuple<float64>>>>& quantizationMatrixPtr) {
-            statisticsPtr = std::make_unique<DenseDecomposableStatistics<
-              Loss, OutputMatrix, IQuantizationMatrix<CContiguousView<Tuple<float64>>>, EvaluationMeasure>>(
+            statisticsPtr = std::make_unique<
+              DenseDecomposableStatistics<Loss, OutputMatrix, IQuantizationMatrix<CContiguousView<Tuple<float64>>>,
+                                          DenseDecomposableStatisticVector, EvaluationMeasure>>(
               std::move(quantizationMatrixPtr), std::move(lossPtr), std::move(evaluationMeasurePtr),
               ruleEvaluationFactory, outputMatrix, std::move(statisticMatrixPtr), std::move(scoreMatrixPtr));
         };

diff --git a/...ects/boosting/src/mlrl/boosting/statistics/statistics_provider_non_decomposable_dense.cpp b/...ects/boosting/src/mlrl/boosting/statistics/statistics_provider_non_decomposable_dense.cpp
@@ -150,7 +150,8 @@ namespace boosting {
                 auto denseDecomposableMatrixVisitor =
                   [&](std::unique_ptr<IQuantizationMatrix<CContiguousView<Tuple<float64>>>>& quantizationMatrixPtr) {
                     statisticsPtr = std::make_unique<DenseDecomposableStatistics<
-                      Loss, OutputMatrix, IQuantizationMatrix<CContiguousView<Tuple<float64>>>, EvaluationMeasure>>(
+                      Loss, OutputMatrix, IQuantizationMatrix<CContiguousView<Tuple<float64>>>,
+                      DenseDecomposableStatisticVector, EvaluationMeasure>>(
                       std::move(quantizationMatrixPtr), std::move(this->lossPtr_),
                       std::move(this->evaluationMeasurePtr_), ruleEvaluationFactory, this->outputMatrix_,
                       std::move(decomposableStatisticMatrixPtr), std::move(this->scoreMatrixPtr_));