Merge branch 'development' into approximate-conditions

mrapp-ke · Sep 30, 2020 · c75a663 · c75a663
2 parents 0c93a65 + 3ceadf7
commit c75a663
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/python/boomer/common/cpp/statistics.h b/python/boomer/common/cpp/statistics.h
@@ -269,7 +269,7 @@ class AbstractStatistics : virtual public IMatrix {
          * rule.
          *
          * @param statisticIndex    The index of the statistic to be updated
-         * @param head              A pointer to an object of type `Prediction`, representing the predictions of the
+         * @param prediction        A pointer to an object of type `Prediction`, representing the predictions of the
          *                          newly induced rule
          */
         virtual void applyPrediction(uint32 statisticIndex, Prediction* prediction) = 0;

diff --git a/python/boomer/common/rule_induction.pyx b/python/boomer/common/rule_induction.pyx
@@ -744,8 +744,9 @@ cdef inline void __recalculate_predictions(AbstractStatistics* statistics, uint3
     for r in range(num_statistics):
         if covered_statistics_mask[r] == covered_statistics_target:
             statistics_subset_ptr.get().addToSubset(r, 1)
-            prediction = head_refinement.calculatePrediction(statistics_subset_ptr.get(), False, False)
-            updated_scores = prediction.predictedScores_
 
-            for c in range(num_predictions):
-                predicted_scores[c] = updated_scores[c]
+    prediction = head_refinement.calculatePrediction(statistics_subset_ptr.get(), False, False)
+    updated_scores = prediction.predictedScores_
+
+    for c in range(num_predictions):
+        predicted_scores[c] = updated_scores[c]