added early stopping when converging feature generation

setup.py

@@ -9,7 +9,7 @@
 from setuptools import setup, find_packages, Extension
 from setuptools.command.build_ext import build_ext
 
-__version__ = "0.3.28"
+__version__ = "0.3.29"
 HERE = Path(__file__).resolve().parent
 
 

src/generator/feature_generator.cpp

@@ -163,6 +163,7 @@ void FeatureGeneratorImpl::generate_inductively(
     utils::g_log << "Started generating composite features. " << std::endl;
     int max_complexity = std::max({concept_complexity_limit, role_complexity_limit, boolean_complexity_limit, count_numerical_complexity_limit, distance_numerical_complexity_limit});
     for (int target_complexity = 2; target_complexity <= max_complexity; ++target_complexity) {  // every composition adds at least one complexity
+        const auto num_features = data.get_num_features();
         if (target_complexity <= concept_complexity_limit) {
             if (data.reached_resource_limit()) break;
             for (const auto& rule : m_concept_inductive_rules) {
@@ -195,6 +196,11 @@ void FeatureGeneratorImpl::generate_inductively(
         utils::g_log << "Complexity " << target_complexity << ":" << std::endl;
         data.print_statistics();
         print_statistics();
+
+        if (num_features == data.get_num_features()) {
+            utils::g_log << "Feature generation converged." << std::endl;
+            break;
+        }
     }
     utils::g_log << "Finished generating composite features." << std::endl;
 }

src/generator/generator_data.h

@@ -45,6 +45,10 @@ struct GeneratorData {
         m_feature_limit(feature_limit),
         m_timer(time_limit) { }
 
+    int get_num_features() {
+      return std::get<0>(m_generated_features).size() + std::get<1>(m_generated_features).size() + std::get<2>(m_generated_features).size() + std::get<3>(m_generated_features).size();
+    }
+
     void print_statistics() const {
         std::cout << "Total concept elements: " << std::accumulate(m_concepts_by_iteration.begin(), m_concepts_by_iteration.end(), 0, [&](int current_sum, const auto& e){ return current_sum + e.size(); }) << std::endl
                   << "Total role elements: " << std::accumulate(m_roles_by_iteration.begin(), m_roles_by_iteration.end(), 0, [&](int current_sum, const auto& e){ return current_sum + e.size(); }) << std::endl
@@ -53,7 +57,7 @@ struct GeneratorData {
     }
 
     bool reached_resource_limit() {
-      return (static_cast<int>(std::get<0>(m_generated_features).size() + std::get<1>(m_generated_features).size() + std::get<2>(m_generated_features).size() + std::get<3>(m_generated_features).size()) >= m_feature_limit || m_timer.is_expired());
+      return (get_num_features() >= m_feature_limit || m_timer.is_expired());
     }
 };