Fix listener option naming: change LINSPIRE_BUILD_LISTENERS to LINSPIRE_ENABLE_LISTENERS for consistency in CMake and header files.

Author: riccardodebenedictis

CMakeLists.txt

@@ -4,7 +4,7 @@ project(LinSpire VERSION 0.2.0 LANGUAGES CXX)
 include(CTest)
 enable_testing()
 
-option(LINSPIRE_BUILD_LISTENERS "Enable listener functionality in LinSpire" OFF)
+option(LINSPIRE_ENABLE_LISTENERS "Enable listener functionality in LinSpire" OFF)
 
 add_library(LinSpire src/linspire.cpp src/var.cpp)
 target_compile_features(LinSpire PUBLIC cxx_std_17)
@@ -16,9 +16,9 @@ add_dependencies(LinSpire json)
 target_link_libraries(LinSpire PUBLIC json)
 setup_sanitizers(LinSpire)
 
-message(STATUS "Enable listener functionality in LinSpire: ${LINSPIRE_BUILD_LISTENERS}")
-if(LINSPIRE_BUILD_LISTENERS)
-    target_compile_definitions(LinSpire PUBLIC LINSPIRE_BUILD_LISTENERS)
+message(STATUS "Enable listener functionality in LinSpire: ${LINSPIRE_ENABLE_LISTENERS}")
+if(LINSPIRE_ENABLE_LISTENERS)
+    target_compile_definitions(LinSpire PUBLIC LINSPIRE_ENABLE_LISTENERS)
 endif()
 
 if(BUILD_TESTING)

include/linspire.hpp

@@ -6,7 +6,7 @@
 
 namespace linspire
 {
-#ifdef LINSPIRE_BUILD_LISTENERS
+#ifdef LINSPIRE_ENABLE_LISTENERS
   class listener;
 #endif
 
@@ -188,7 +188,7 @@ namespace linspire
      */
     [[nodiscard]] const std::vector<std::shared_ptr<const constraint>> &get_conflict() const noexcept { return cnfl; }
 
-#ifdef LINSPIRE_BUILD_LISTENERS
+#ifdef LINSPIRE_ENABLE_LISTENERS
     /**
      * @brief Adds a listener to the solver.
      *
@@ -231,7 +231,7 @@ namespace linspire
     std::map<utils::var, utils::lin> tableau;            // basic variable -> expression
     std::vector<std::set<utils::var>> t_watches;         // for each variable `v`, a set of tableau rows watching `v`..
     std::vector<std::shared_ptr<const constraint>> cnfl; // the last conflict explanation..
-#ifdef LINSPIRE_BUILD_LISTENERS
+#ifdef LINSPIRE_ENABLE_LISTENERS
     std::unordered_map<utils::var, std::set<listener *>> listening; // for each variable, the listeners listening to it..
     std::set<std::shared_ptr<listener>> listeners;                  // the collection of listeners..
 #endif
@@ -245,7 +245,7 @@ namespace linspire
     std::map<utils::var, utils::inf_rational> lbs, ubs;
   };
 
-#ifdef LINSPIRE_BUILD_LISTENERS
+#ifdef LINSPIRE_ENABLE_LISTENERS
   class listener
   {
   public:

src/linspire.cpp

@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <cassert>
 
-#ifdef LINSPIRE_BUILD_LISTENERS
+#ifdef LINSPIRE_ENABLE_LISTENERS
 #define FIRE_ON_VALUE_CHANGED(var)                                       \
     if (const auto &at_v = listening.find(var); at_v != listening.end()) \
         for (auto &l : at_v->second)                                     \
@@ -364,7 +364,7 @@ namespace linspire
         tableau.emplace(x, std::move(l));
     }
 
-#ifdef LINSPIRE_BUILD_LISTENERS
+#ifdef LINSPIRE_ENABLE_LISTENERS
     void solver::add_listener(std::shared_ptr<listener> l) noexcept { listeners.insert(l); }
     void solver::remove_listener(std::shared_ptr<listener> l) noexcept { listeners.erase(l); }
 #endif