Move files from directory "thresholds" into directory "rule_refinement".

mrapp-ke · Feb 21, 2024 · 86c1b5d · 86c1b5d
1 parent a69d30d
commit 86c1b5d
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 26 deletions.
diff --git a/cpp/subprojects/common/include/mlrl/common/input/feature_vector.hpp b/cpp/subprojects/common/include/mlrl/common/input/feature_vector.hpp
@@ -4,9 +4,9 @@
 #pragma once
 
 #include "mlrl/common/input/interval.hpp"
+#include "mlrl/common/rule_refinement/coverage_mask.hpp"
 #include "mlrl/common/rule_refinement/feature_based_search.hpp"
 #include "mlrl/common/statistics/statistics_weighted.hpp"
-#include "mlrl/common/thresholds/coverage_mask.hpp"
 
 /**
  * Defines an interface for all one-dimensional vectors that store the values of training examples for a certain

diff --git a/cpp/subprojects/common/include/mlrl/common/post_optimization/post_optimization.hpp b/cpp/subprojects/common/include/mlrl/common/post_optimization/post_optimization.hpp
@@ -7,9 +7,9 @@
 #include "mlrl/common/post_processing/post_processor.hpp"
 #include "mlrl/common/rule_induction/rule_induction.hpp"
 #include "mlrl/common/rule_pruning/rule_pruning.hpp"
+#include "mlrl/common/rule_refinement/feature_space.hpp"
 #include "mlrl/common/sampling/feature_sampling.hpp"
 #include "mlrl/common/sampling/label_sampling.hpp"
-#include "mlrl/common/thresholds/feature_space.hpp"
 
 /**
  * Defines an interface for all classes that allow to optimize a rule-based model globally once it has been learned.

diff --git a/cpp/subprojects/common/include/mlrl/common/rule_induction/rule_induction.hpp b/cpp/subprojects/common/include/mlrl/common/rule_induction/rule_induction.hpp
@@ -8,11 +8,11 @@
 #include "mlrl/common/model/model_builder.hpp"
 #include "mlrl/common/post_processing/post_processor.hpp"
 #include "mlrl/common/rule_pruning/rule_pruning.hpp"
+#include "mlrl/common/rule_refinement/feature_space.hpp"
 #include "mlrl/common/sampling/feature_sampling.hpp"
 #include "mlrl/common/sampling/partition.hpp"
 #include "mlrl/common/sampling/weight_vector.hpp"
 #include "mlrl/common/statistics/statistics.hpp"
-#include "mlrl/common/thresholds/feature_space.hpp"
 
 /**
  * Defines an interface for all classes that implement an algorithm for the induction of individual rules.

diff --git a/cpp/subprojects/common/include/mlrl/common/rule_model_assemblage/rule_model_assemblage.hpp b/cpp/subprojects/common/include/mlrl/common/rule_model_assemblage/rule_model_assemblage.hpp
@@ -6,13 +6,13 @@
 #include "mlrl/common/input/label_matrix_row_wise.hpp"
 #include "mlrl/common/model/model_builder.hpp"
 #include "mlrl/common/rule_induction/rule_induction.hpp"
+#include "mlrl/common/rule_refinement/feature_space.hpp"
 #include "mlrl/common/sampling/feature_sampling.hpp"
 #include "mlrl/common/sampling/instance_sampling.hpp"
 #include "mlrl/common/sampling/label_sampling.hpp"
 #include "mlrl/common/sampling/partition_sampling.hpp"
 #include "mlrl/common/statistics/statistics_provider.hpp"
 #include "mlrl/common/stopping/stopping_criterion.hpp"
-#include "mlrl/common/thresholds/feature_space.hpp"
 
 /**
  * Defines an interface for all classes that implement an algorithm for the induction of several rules that will be

diff --git a/cpp/subprojects/common/include/mlrl/common/rule_pruning/rule_pruning.hpp b/cpp/subprojects/common/include/mlrl/common/rule_pruning/rule_pruning.hpp
@@ -4,8 +4,8 @@
 #pragma once
 
 #include "mlrl/common/model/condition_list.hpp"
+#include "mlrl/common/rule_refinement/feature_subspace.hpp"
 #include "mlrl/common/sampling/partition.hpp"
-#include "mlrl/common/thresholds/feature_subspace.hpp"
 
 /**
  * Defines an interface for all classes that implement a strategy for pruning individual rules based on a "prune set",

diff --git a/.../mlrl/common/thresholds/coverage_mask.hpp → .../common/rule_refinement/coverage_mask.hpp b/.../mlrl/common/thresholds/coverage_mask.hpp → .../common/rule_refinement/coverage_mask.hpp
diff --git a/.../mlrl/common/thresholds/feature_space.hpp → .../common/rule_refinement/feature_space.hpp b/.../mlrl/common/thresholds/feature_space.hpp → .../common/rule_refinement/feature_space.hpp
@@ -5,11 +5,11 @@
 
 #include "mlrl/common/input/feature_info.hpp"
 #include "mlrl/common/input/feature_matrix_column_wise.hpp"
+#include "mlrl/common/rule_refinement/feature_subspace.hpp"
 #include "mlrl/common/sampling/weight_vector_bit.hpp"
 #include "mlrl/common/sampling/weight_vector_dense.hpp"
 #include "mlrl/common/sampling/weight_vector_equal.hpp"
 #include "mlrl/common/statistics/statistics_provider.hpp"
-#include "mlrl/common/thresholds/feature_subspace.hpp"
 
 /**
  * Defines an interface for all classes that provide access to the feature space.

diff --git a/...mmon/thresholds/feature_space_tabular.hpp → ...rule_refinement/feature_space_tabular.hpp b/...mmon/thresholds/feature_space_tabular.hpp → ...rule_refinement/feature_space_tabular.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "mlrl/common/input/feature_binning.hpp"
-#include "mlrl/common/thresholds/feature_space.hpp"
+#include "mlrl/common/rule_refinement/feature_space.hpp"
 
 /**
  * Allows to create objects of type `IFeatureSpace` that provide access to a tabular feature space.

diff --git a/...rl/common/thresholds/feature_subspace.hpp → ...mmon/rule_refinement/feature_subspace.hpp b/...rl/common/thresholds/feature_subspace.hpp → ...mmon/rule_refinement/feature_subspace.hpp
@@ -6,11 +6,11 @@
 #include "mlrl/common/indices/index_vector_complete.hpp"
 #include "mlrl/common/indices/index_vector_partial.hpp"
 #include "mlrl/common/model/condition.hpp"
+#include "mlrl/common/rule_refinement/coverage_mask.hpp"
 #include "mlrl/common/rule_refinement/prediction.hpp"
 #include "mlrl/common/rule_refinement/rule_refinement.hpp"
 #include "mlrl/common/sampling/partition_bi.hpp"
 #include "mlrl/common/sampling/partition_single.hpp"
-#include "mlrl/common/thresholds/coverage_mask.hpp"
 
 #include <memory>
 

diff --git a/cpp/subprojects/common/include/mlrl/common/sampling/partition.hpp b/cpp/subprojects/common/include/mlrl/common/sampling/partition.hpp
@@ -3,7 +3,7 @@
  */
 #pragma once
 
-#include "mlrl/common/thresholds/coverage_mask.hpp"
+#include "mlrl/common/rule_refinement/coverage_mask.hpp"
 #include "mlrl/common/util/quality.hpp"
 
 #include <memory>

diff --git a/cpp/subprojects/common/meson.build b/cpp/subprojects/common/meson.build
@@ -51,7 +51,9 @@ source_files = [
     'src/mlrl/common/rule_model_assemblage/rule_model_assemblage_sequential.cpp',
     'src/mlrl/common/rule_pruning/rule_pruning_irep.cpp',
     'src/mlrl/common/rule_pruning/rule_pruning_no.cpp',
+    'src/mlrl/common/rule_refinement/coverage_mask.cpp',
     'src/mlrl/common/rule_refinement/feature_based_search.cpp',
+    'src/mlrl/common/rule_refinement/feature_space_tabular.cpp',
     'src/mlrl/common/rule_refinement/prediction_complete.cpp',
     'src/mlrl/common/rule_refinement/prediction_partial.cpp',
     'src/mlrl/common/rule_refinement/refinement_comparator_fixed.cpp',
@@ -87,8 +89,6 @@ source_files = [
     'src/mlrl/common/stopping/stopping_criterion_list.cpp',
     'src/mlrl/common/stopping/stopping_criterion_size.cpp',
     'src/mlrl/common/stopping/stopping_criterion_time.cpp',
-    'src/mlrl/common/thresholds/coverage_mask.cpp',
-    'src/mlrl/common/thresholds/feature_space_tabular.cpp',
     'src/mlrl/common/info.cpp',
     'src/mlrl/common/learner.cpp'
 ]

diff --git a/cpp/subprojects/common/src/mlrl/common/indices/index_vector_complete.cpp b/cpp/subprojects/common/src/mlrl/common/indices/index_vector_complete.cpp
@@ -1,6 +1,6 @@
 #include "mlrl/common/indices/index_vector_complete.hpp"
 
-#include "mlrl/common/thresholds/feature_subspace.hpp"
+#include "mlrl/common/rule_refinement/feature_subspace.hpp"
 
 CompleteIndexVector::CompleteIndexVector(uint32 numElements) {
     numElements_ = numElements;

diff --git a/cpp/subprojects/common/src/mlrl/common/indices/index_vector_partial.cpp b/cpp/subprojects/common/src/mlrl/common/indices/index_vector_partial.cpp
@@ -1,6 +1,6 @@
 #include "mlrl/common/indices/index_vector_partial.hpp"
 
-#include "mlrl/common/thresholds/feature_subspace.hpp"
+#include "mlrl/common/rule_refinement/feature_subspace.hpp"
 
 PartialIndexVector::PartialIndexVector(uint32 numElements, bool init)
     : ResizableVectorDecorator<DenseVectorDecorator<ResizableVector<uint32>>>(

diff --git a/cpp/subprojects/common/src/mlrl/common/learner.cpp b/cpp/subprojects/common/src/mlrl/common/learner.cpp
@@ -1,8 +1,8 @@
 #include "mlrl/common/learner.hpp"
 
 #include "mlrl/common/prediction/label_space_info_no.hpp"
+#include "mlrl/common/rule_refinement/feature_space_tabular.hpp"
 #include "mlrl/common/stopping/stopping_criterion_size.hpp"
-#include "mlrl/common/thresholds/feature_space_tabular.hpp"
 #include "mlrl/common/util/validation.hpp"
 
 /**

diff --git a/cpp/subprojects/common/src/mlrl/common/rule_induction/rule_induction_top_down_common.hpp b/cpp/subprojects/common/src/mlrl/common/rule_induction/rule_induction_top_down_common.hpp
@@ -3,7 +3,7 @@
  */
 #pragma once
 
-#include "mlrl/common/thresholds/feature_subspace.hpp"
+#include "mlrl/common/rule_refinement/feature_subspace.hpp"
 #include "mlrl/common/util/openmp.hpp"
 
 /**

diff --git a/.../mlrl/common/thresholds/coverage_mask.cpp → .../common/rule_refinement/coverage_mask.cpp b/.../mlrl/common/thresholds/coverage_mask.cpp → .../common/rule_refinement/coverage_mask.cpp
@@ -1,7 +1,7 @@
-#include "mlrl/common/thresholds/coverage_mask.hpp"
+#include "mlrl/common/rule_refinement/coverage_mask.hpp"
 
+#include "mlrl/common/rule_refinement/feature_subspace.hpp"
 #include "mlrl/common/rule_refinement/prediction.hpp"
-#include "mlrl/common/thresholds/feature_subspace.hpp"
 
 CoverageMask::CoverageMask(uint32 numElements)
     : DenseVectorDecorator<AllocatedVector<uint32>>(AllocatedVector<uint32>(numElements, true)), indicatorValue(0) {}

diff --git a/...mmon/thresholds/feature_space_tabular.cpp → ...rule_refinement/feature_space_tabular.cpp b/...mmon/thresholds/feature_space_tabular.cpp → ...rule_refinement/feature_space_tabular.cpp
@@ -1,4 +1,4 @@
-#include "mlrl/common/thresholds/feature_space_tabular.hpp"
+#include "mlrl/common/rule_refinement/feature_space_tabular.hpp"
 
 #include "mlrl/common/rule_refinement/rule_refinement_feature_based.hpp"
 #include "mlrl/common/util/openmp.hpp"

diff --git a/cpp/subprojects/common/src/mlrl/common/sampling/partition_bi.cpp b/cpp/subprojects/common/src/mlrl/common/sampling/partition_bi.cpp
@@ -1,10 +1,10 @@
 #include "mlrl/common/sampling/partition_bi.hpp"
 
 #include "mlrl/common/prediction/probability_calibration_joint.hpp"
+#include "mlrl/common/rule_refinement/feature_subspace.hpp"
 #include "mlrl/common/rule_refinement/prediction.hpp"
 #include "mlrl/common/sampling/instance_sampling.hpp"
 #include "mlrl/common/stopping/stopping_criterion.hpp"
-#include "mlrl/common/thresholds/feature_subspace.hpp"
 
 #include <algorithm>
 

diff --git a/cpp/subprojects/common/src/mlrl/common/sampling/partition_single.cpp b/cpp/subprojects/common/src/mlrl/common/sampling/partition_single.cpp
@@ -1,10 +1,10 @@
 #include "mlrl/common/sampling/partition_single.hpp"
 
 #include "mlrl/common/prediction/probability_calibration_joint.hpp"
+#include "mlrl/common/rule_refinement/feature_subspace.hpp"
 #include "mlrl/common/rule_refinement/prediction.hpp"
 #include "mlrl/common/sampling/instance_sampling.hpp"
 #include "mlrl/common/stopping/stopping_criterion.hpp"
-#include "mlrl/common/thresholds/feature_subspace.hpp"
 
 SinglePartition::SinglePartition(uint32 numElements) : numElements_(numElements) {}
 

diff --git a/cpp/subprojects/common/src/mlrl/common/sampling/weight_vector_bit.cpp b/cpp/subprojects/common/src/mlrl/common/sampling/weight_vector_bit.cpp
@@ -1,7 +1,7 @@
 #include "mlrl/common/sampling/weight_vector_bit.hpp"
 
-#include "mlrl/common/thresholds/feature_space.hpp"
-#include "mlrl/common/thresholds/feature_subspace.hpp"
+#include "mlrl/common/rule_refinement/feature_space.hpp"
+#include "mlrl/common/rule_refinement/feature_subspace.hpp"
 
 BitWeightVector::BitWeightVector(uint32 numElements, bool init) : vector_(numElements, init), numNonZeroWeights_(0) {}
 

diff --git a/cpp/subprojects/common/src/mlrl/common/sampling/weight_vector_dense.cpp b/cpp/subprojects/common/src/mlrl/common/sampling/weight_vector_dense.cpp
@@ -1,7 +1,7 @@
 #include "mlrl/common/sampling/weight_vector_dense.hpp"
 
-#include "mlrl/common/thresholds/feature_space.hpp"
-#include "mlrl/common/thresholds/feature_subspace.hpp"
+#include "mlrl/common/rule_refinement/feature_space.hpp"
+#include "mlrl/common/rule_refinement/feature_subspace.hpp"
 
 template<typename T>
 DenseWeightVector<T>::DenseWeightVector(uint32 numElements, bool init)

diff --git a/cpp/subprojects/common/src/mlrl/common/sampling/weight_vector_equal.cpp b/cpp/subprojects/common/src/mlrl/common/sampling/weight_vector_equal.cpp
@@ -1,7 +1,7 @@
 #include "mlrl/common/sampling/weight_vector_equal.hpp"
 
-#include "mlrl/common/thresholds/feature_space.hpp"
-#include "mlrl/common/thresholds/feature_subspace.hpp"
+#include "mlrl/common/rule_refinement/feature_space.hpp"
+#include "mlrl/common/rule_refinement/feature_subspace.hpp"
 
 EqualWeightVector::EqualWeightVector(uint32 numElements) : numElements_(numElements) {}