Add visitor for handling views of type BitDecomposableMatrixVisitor t…

…o class IQuantization.
mrapp-ke · Aug 19, 2024 · 0d152d1 · 0d152d1
1 parent b407be6
commit 0d152d1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/cpp/subprojects/boosting/include/mlrl/boosting/statistics/quantization.hpp b/cpp/subprojects/boosting/include/mlrl/boosting/statistics/quantization.hpp
@@ -3,6 +3,7 @@
  */
 #pragma once
 
+#include "mlrl/boosting/data/view_statistic_decomposable_bit.hpp"
 #include "mlrl/boosting/data/view_statistic_non_decomposable_dense.hpp"
 #include "mlrl/common/data/tuple.hpp"
 #include "mlrl/common/data/view_matrix_c_contiguous.hpp"
@@ -43,6 +44,13 @@ namespace boosting {
             typedef std::function<void(std::unique_ptr<IQuantizationMatrix<SparseSetView<Tuple<float64>>>>&)>
               SparseDecomposableMatrixVisitor;
 
+            /**
+             * A visitor function for handling quantization matrices that are backed by a view of the type
+             * `BitDecomposableStatisticView`.
+             */
+            typedef std::function<void(std::unique_ptr<IQuantizationMatrix<BitDecomposableStatisticView>>&)>
+              BitDecomposableMatrixVisitor;
+
             /**
              * A visitor function for handling quantization matrices that are backed by a view of the type
              * `DenseNonDecomposableStatisticView`.
@@ -60,13 +68,17 @@ namespace boosting {
              * @param sparseDecomposableMatrixVisitor   An optional visitor function for handling quantization matrices
              *                                          that are backed by a view of the type
              *                                          `SparseSetView<Tuple<float64>>`
+             * @param bitDecomposableMatrixVisitor      An optional visitor function for handling quantization matrices
+             *                                          that are backed by a view of the type
+             *                                          `BitDecomposableStatisticView`
              * @param denseNonDecomposableMatrixVisitor An optional visitor function for handling quantization matrices
              *                                          that are backed by a view of the type
              *                                          `DenseNonDecomposableStatisticView`
              */
             virtual void visitQuantizationMatrix(
               std::optional<DenseDecomposableMatrixVisitor> denseDecomposableMatrixVisitor,
               std::optional<SparseDecomposableMatrixVisitor> sparseDecomposableMatrixVisitor,
+              std::optional<BitDecomposableMatrixVisitor> bitDecomposableMatrixVisitor,
               std::optional<DenseNonDecomposableMatrixVisitor> denseNonDecomposableMatrixVisitor) = 0;
     };
 

diff --git a/cpp/subprojects/boosting/src/mlrl/boosting/statistics/quantization_no.cpp b/cpp/subprojects/boosting/src/mlrl/boosting/statistics/quantization_no.cpp
@@ -16,6 +16,7 @@ namespace boosting {
             void visitQuantizationMatrix(
               std::optional<IQuantization::DenseDecomposableMatrixVisitor> denseDecomposableMatrixVisitor,
               std::optional<IQuantization::SparseDecomposableMatrixVisitor> sparseDecomposableMatrixVisitor,
+              std::optional<BitDecomposableMatrixVisitor> bitDecomposableMatrixVisitor,
               std::optional<IQuantization::DenseNonDecomposableMatrixVisitor> denseNonDecomposableMatrixVisitor)
               override {
                 if (denseDecomposableMatrixVisitor) {
@@ -38,6 +39,7 @@ namespace boosting {
             void visitQuantizationMatrix(
               std::optional<IQuantization::DenseDecomposableMatrixVisitor> denseDecomposableMatrixVisitor,
               std::optional<IQuantization::SparseDecomposableMatrixVisitor> sparseDecomposableMatrixVisitor,
+              std::optional<BitDecomposableMatrixVisitor> bitDecomposableMatrixVisitor,
               std::optional<IQuantization::DenseNonDecomposableMatrixVisitor> denseNonDecomposableMatrixVisitor)
               override {
                 if (sparseDecomposableMatrixVisitor) {
@@ -60,6 +62,7 @@ namespace boosting {
             void visitQuantizationMatrix(
               std::optional<IQuantization::DenseDecomposableMatrixVisitor> denseDecomposableMatrixVisitor,
               std::optional<IQuantization::SparseDecomposableMatrixVisitor> sparseDecomposableMatrixVisitor,
+              std::optional<BitDecomposableMatrixVisitor> bitDecomposableMatrixVisitor,
               std::optional<IQuantization::DenseNonDecomposableMatrixVisitor> denseNonDecomposableMatrixVisitor)
               override {
                 if (denseNonDecomposableMatrixVisitor) {

diff --git a/cpp/subprojects/boosting/src/mlrl/boosting/statistics/quantization_stochastic.cpp b/cpp/subprojects/boosting/src/mlrl/boosting/statistics/quantization_stochastic.cpp
@@ -20,9 +20,12 @@ namespace boosting {
             void visitQuantizationMatrix(
               std::optional<IQuantization::DenseDecomposableMatrixVisitor> denseDecomposableMatrixVisitor,
               std::optional<IQuantization::SparseDecomposableMatrixVisitor> sparseDecomposableMatrixVisitor,
+              std::optional<BitDecomposableMatrixVisitor> bitDecomposableMatrixVisitor,
               std::optional<IQuantization::DenseNonDecomposableMatrixVisitor> denseNonDecomposableMatrixVisitor)
               override {
-                // TODO Implement
+                if (bitDecomposableMatrixVisitor) {
+                    (*bitDecomposableMatrixVisitor)(quantizationMatrixPtr_);
+                }
             }
     };
 

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
@@ -40,7 +40,7 @@ namespace boosting {
               std::move(quantizationMatrixPtr), std::move(lossPtr), std::move(evaluationMeasurePtr),
               ruleEvaluationFactory, outputMatrix, std::move(statisticMatrixPtr), std::move(scoreMatrixPtr));
         };
-        quantizationPtr->visitQuantizationMatrix(denseDecomposableMatrixVisitor, {}, {});
+        quantizationPtr->visitQuantizationMatrix(denseDecomposableMatrixVisitor, {}, {}, {});
         return statisticsPtr;
     }
 

diff --git a/...rojects/boosting/src/mlrl/boosting/statistics/statistics_provider_decomposable_sparse.cpp b/...rojects/boosting/src/mlrl/boosting/statistics/statistics_provider_decomposable_sparse.cpp
@@ -123,7 +123,7 @@ namespace boosting {
               std::move(quantizationMatrixPtr), std::move(lossPtr), std::move(evaluationMeasurePtr),
               ruleEvaluationFactory, outputMatrix, std::move(statisticMatrixPtr), std::move(scoreMatrixPtr));
         };
-        quantizationPtr->visitQuantizationMatrix({}, sparseDecomposableMatrixVisitor, {});
+        quantizationPtr->visitQuantizationMatrix({}, sparseDecomposableMatrixVisitor, {}, {});
         return statisticsPtr;
     }
 

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
@@ -154,7 +154,7 @@ namespace boosting {
                       std::move(this->evaluationMeasurePtr_), ruleEvaluationFactory, this->outputMatrix_,
                       std::move(decomposableStatisticMatrixPtr), std::move(this->scoreMatrixPtr_));
                 };
-                quantizationPtr->visitQuantizationMatrix(denseDecomposableMatrixVisitor, {}, {});
+                quantizationPtr->visitQuantizationMatrix(denseDecomposableMatrixVisitor, {}, {}, {});
                 return statisticsPtr;
             }
     };
@@ -197,7 +197,7 @@ namespace boosting {
               std::move(quantizationMatrixPtr), std::move(lossPtr), std::move(evaluationMeasurePtr),
               ruleEvaluationFactory, outputMatrix, std::move(statisticMatrixPtr), std::move(scoreMatrixPtr));
         };
-        quantizationPtr->visitQuantizationMatrix({}, {}, denseNonDecomposableMatrixVisitor);
+        quantizationPtr->visitQuantizationMatrix({}, {}, {}, denseNonDecomposableMatrixVisitor);
         return statisticsPtr;
     }