Merge branch 'latest' into strong-branch-refactor

Author: jajhall

.github/workflows/build-fast.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE
+        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_UNITY_BUILD=ON
 
       - name: Build
         working-directory: ${{runner.workspace}}/build
@@ -45,7 +45,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG
+        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_UNITY_BUILD=ON
 
       - name: Build
         working-directory: ${{runner.workspace}}/build

CMakeLists.txt

@@ -73,7 +73,7 @@ option(BUILD_CXX "Build C++ library" ON)
 message(STATUS "Build C++ library: ${BUILD_CXX}")
 
 option(BUILD_CXX_EXE "Build C++ executable" ON)
-message(STATUS "Build C++ library: ${BUILD_CXX_EXE}")
+message(STATUS "Build C++ executable: ${BUILD_CXX_EXE}")
 
 option(BUILD_TESTING "Build Tests" ON)
 

FEATURES.md

@@ -6,5 +6,8 @@ Forcing column reduction now checks the bound on the column dual rather than whe
 
 Now handling correctly the case where an infeasible MIP has a feasible relaxation, so no ray is computed fixing [#2415](https://github.com/ERGO-Code/HiGHS/issues/2415)
 
-Refactored strong branching to minimise duplicated code
+Refactored strong branching to minimize duplicated code
+
+Fixed minor bug exposed by [#2441](https://github.com/ERGO-Code/HiGHS/issues/2441) in Highs::setSolution() for a sparse user solution when the moidel is empty, and only clearing the dual data before solving with modified objective in Highs::multiobjectiveSolve() so that user-supplied solution is not cleared.
+
 

app/CMakeLists.txt

@@ -25,6 +25,7 @@ if(FAST_BUILD)
     endif()
 
     set_target_properties(highs-bin PROPERTIES OUTPUT_NAME highs)
+    set_target_properties(highs-bin PROPERTIES UNITY_BUILD OFF)
 
     target_compile_features(highs-bin PRIVATE cxx_std_11)
     target_link_libraries(highs-bin PRIVATE ${PROJECT_NAMESPACE}::highs)
@@ -78,6 +79,8 @@ else()
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/app>
   )
 
+  set_target_properties(highs PROPERTIES UNITY_BUILD OFF)
+
   # install the binary
   install(TARGETS highs EXPORT highs-targets
     RUNTIME)
@@ -87,4 +90,4 @@ endif()
 if(EMSCRIPTEN AND EMSCRIPTEN_HTML)
   set(CMAKE_EXECUTABLE_SUFFIX ".html")
   set_target_properties(highs PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/highs_webdemo_shell.html)
-endif()
+endif()

check/CMakeLists.txt

@@ -106,6 +106,8 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
 
   add_executable(unit_tests ${TEST_SOURCES})
 
+  set_target_properties(unit_tests PROPERTIES UNITY_BUILD OFF)
+
   if (UNIX)
       target_compile_options(unit_tests PRIVATE "-Wno-unused-variable")
       target_compile_options(unit_tests PRIVATE "-Wno-unused-const-variable")
@@ -258,7 +260,7 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
       "lseu\;1120|1119.9999999\;"
       "egout\;(568.1007|568.1006999)\;"
       "gt2\;21166\;"
-      "rgn\;82.1999992\;"
+      "rgn\;82.19999\;"
       "bell5\;(8966406.49152|8966406.491519|8966406.49151)\;"
       "sp150x300d\;(69|68.9999999)\;"
       "p0548\;(8691|8690.9999999)\;"

check/TestMipSolver.cpp

@@ -932,8 +932,6 @@ TEST_CASE("issue-2290", "[highs_test_mip_solver]") {
 
 TEST_CASE("issue-2409", "[highs_test_mip_solver]") {
   HighsLp lp;
-  HighsModelStatus require_model_status;
-  double optimal_objective;
   lp.num_col_ = 2;
   lp.num_row_ = 2;
   lp.col_cost_ = {-1, 1};
@@ -945,8 +943,8 @@ TEST_CASE("issue-2409", "[highs_test_mip_solver]") {
   lp.a_matrix_.index_ = {0, 1, 0, 1};
   lp.a_matrix_.value_ = {-1, 1, 1, 1};
   lp.integrality_ = {HighsVarType::kContinuous, HighsVarType::kInteger};
-  require_model_status = HighsModelStatus::kOptimal;
-  optimal_objective = 0.1;
+  const HighsModelStatus require_model_status = HighsModelStatus::kOptimal;
+  const double optimal_objective = 0.1;
   Highs highs;
   REQUIRE(highs.passModel(lp) == HighsStatus::kOk);
   if (dev_run) printf("Testing that presolve reduces the problem to empty\n");
@@ -956,12 +954,48 @@ TEST_CASE("issue-2409", "[highs_test_mip_solver]") {
 
   if (dev_run)
     printf(
-        "\nTesting that with presolve the correct optimal objecive is found\n");
+        "\nTesting that with presolve the correct optimal objective is "
+        "found\n");
+  solve(highs, kHighsOnString, require_model_status, optimal_objective);
+  highs.clearSolver();
+  if (dev_run)
+    printf(
+        "\nTesting that without presolve the correct optimal objective is "
+        "found\n");
+  solve(highs, kHighsOffString, require_model_status, optimal_objective);
+}
+
+TEST_CASE("issue-2432", "[highs_test_mip_solver]") {
+  HighsLp lp;
+  lp.num_col_ = 3;
+  lp.num_row_ = 3;
+  lp.col_cost_ = {-93, 25, 17};
+  lp.col_lower_ = {-100, -100, -100};
+  lp.col_upper_ = {120, 10, 0};
+  lp.row_lower_ = {3994.5, -4878.3, -4930};
+  lp.row_upper_ = {kHighsInf, kHighsInf, kHighsInf};
+  lp.a_matrix_.start_ = {0, 3, 6, 9};
+  lp.a_matrix_.index_ = {0, 1, 2, 0, 1, 2, 0, 1, 2};
+  lp.a_matrix_.value_ = {-89, -0.1, -8.6, -40.7, 77.2, -6.5, -12, -23.7, 72.78};
+  lp.integrality_ = {HighsVarType::kInteger, HighsVarType::kContinuous,
+                     HighsVarType::kInteger};
+  const HighsModelStatus require_model_status = HighsModelStatus::kOptimal;
+  const double optimal_objective = -3777.57124352;
+  Highs highs;
+  REQUIRE(highs.passModel(lp) == HighsStatus::kOk);
+  if (dev_run) printf("Testing that presolve reduces the problem\n");
+  REQUIRE(highs.presolve() == HighsStatus::kOk);
+  REQUIRE(highs.getModelPresolveStatus() == HighsPresolveStatus::kReduced);
+
+  if (dev_run)
+    printf(
+        "\nTesting that with presolve the correct optimal objective is "
+        "found\n");
   solve(highs, kHighsOnString, require_model_status, optimal_objective);
   highs.clearSolver();
   if (dev_run)
     printf(
-        "\nTesting that without presolve the correct optimal objecive is "
+        "\nTesting that without presolve the correct optimal objective is "
         "found\n");
   solve(highs, kHighsOffString, require_model_status, optimal_objective);
 }

cmake/cpp-highs.cmake

@@ -151,6 +151,7 @@ function(highs_cxx_test FILE_NAME)
 
   target_compile_features(${TEST_NAME} PRIVATE cxx_std_11)
   target_link_libraries(${TEST_NAME} PRIVATE ${PROJECT_NAMESPACE}::highs)
+  set_target_properties(${TEST_NAME} PROPERTIES UNITY_BUILD OFF)
 
   # include(GNUInstallDirs)
   # if(APPLE)
@@ -197,6 +198,7 @@ function(highs_c_test FILE_NAME)
 
   target_compile_features(${TEST_NAME} PRIVATE cxx_std_11)
   target_link_libraries(${TEST_NAME} PRIVATE ${PROJECT_NAMESPACE}::highs)
+  set_target_properties(${TEST_NAME} PROPERTIES UNITY_BUILD OFF)
 
   # include(GNUInstallDirs)
   # if(APPLE)

cmake/sources.cmake

@@ -176,6 +176,9 @@ set(ipx_headers
   ipm/ipx/timer.h
   ipm/ipx/utils.h)
 
+# redefinition of 'kHighsInf'
+set_source_files_properties (../extern/filereaderlp/reader.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
+
 set(highs_sources
     ../extern/filereaderlp/reader.cpp
     interfaces/highs_c_api.cpp

highs/Highs.h

@@ -90,6 +90,11 @@ class Highs {
    */
   HighsStatus clearSolver();
 
+  /**
+   * @brief Clear all dual data associated with the model
+   */
+  HighsStatus clearSolverDualData();
+
   /**
    * Methods for model input
    */
@@ -1542,6 +1547,12 @@ class Highs {
   // invalidateRanging(), invalidateInfo(), invalidateEkk() and
   // invalidateIis()
   void invalidateSolverData();
+
+  // Invalidates all solver dual data in Highs class members by calling
+  // invalidateModelStatus(), invalidateRanging(), and invalidateInfo()
+  //
+  // Used when only the objective changes
+  void invalidateSolverDualData();
   //
   // Invalidates the model status, solution_ and info_
   void invalidateModelStatusSolutionAndInfo();

highs/ipm/basiclu/lu_list.h

@@ -1,3 +1,6 @@
+#ifndef _LU_LIST_H
+#define _LU_LIST_H
+
 /*
  * lu_list.h
  *
@@ -166,3 +169,5 @@ static inline void lu_list_swap(
         blink[e2next] = e1;
     }
 }
+
+#endif