Merge pull request #66 from cvanaret/no_option_file

Removed now useless option file
cvanaret · Nov 4, 2024 · 6c5d4ce · 6c5d4ce
2 parents 60c18fc + 5ddc990
commit 6c5d4ce
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 254 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -184,9 +184,6 @@ set_property(TARGET uno PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_include_directories(uno PUBLIC ${DIRECTORIES})
 target_link_libraries(uno PUBLIC ${LIBRARIES})
 
-# copy the option file
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/uno.options DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
 ######################
 # optional AMPL main #
 ######################

diff --git a/uno.options b/uno.options
diff --git a/uno/options/DefaultOptions.cpp b/uno/options/DefaultOptions.cpp
@@ -29,7 +29,7 @@ namespace uno {
       options["enforce_linear_constraints"] = "no";
 
       /** statistics table **/
-      options["statistics_print_header_every_iterations"] = "15";
+      options["statistics_print_header_frequency"] = "15";
       options["statistics_major_column_order"] = "1";
       options["statistics_minor_column_order"] = "2";
       options["statistics_penalty_parameter_column_order"] = "5";

diff --git a/uno/tools/Statistics.cpp b/uno/tools/Statistics.cpp
@@ -14,8 +14,7 @@ namespace uno {
    int Statistics::string_width = 26;
    int Statistics::numerical_format_size = 6;
 
-   Statistics::Statistics(const Options& options): print_header_every_iterations(options.get_unsigned_int("statistics_print_header_every_iterations")) {
-   }
+   Statistics::Statistics(const Options& options): print_header_frequency(options.get_unsigned_int("statistics_print_header_frequency")) { }
 
    void Statistics::add_column(std::string_view name, int width, int order) {
       this->columns[order] = name;
@@ -66,7 +65,7 @@ namespace uno {
 
    void Statistics::print_header() {
       /* line above */
-      this->print_horizontal_line(this->iteration == 0);
+      this->print_horizontal_line(this->line_number == 0);
       /* headers */
       std::cout << Statistics::symbol("left");
       size_t k = 0;
@@ -87,7 +86,7 @@ namespace uno {
    }
 
    void Statistics::print_current_line() {
-      if (this->iteration % this->print_header_every_iterations == 0) {
+      if (this->line_number % this->print_header_frequency == 0) {
          this->print_header();
       }
       std::cout << Statistics::symbol("left");
@@ -114,7 +113,7 @@ namespace uno {
          k++;
       }
       std::cout << Statistics::symbol("right") << '\n';
-      this->iteration++;
+      this->line_number++;
    }
 
    void Statistics::print_footer() {

diff --git a/uno/tools/Statistics.hpp b/uno/tools/Statistics.hpp
@@ -34,12 +34,12 @@ namespace uno {
 
 
    private:
-      size_t iteration{0};
+      size_t line_number{0};
       std::map<int, std::string> columns{};
       std::map<std::string_view, int> widths{};
       std::map<std::string_view, std::string> current_line{};
 
-      size_t print_header_every_iterations{};
+      const size_t print_header_frequency{};
       static std::string_view symbol(std::string_view value);
    };
 } // namespace