Merge pull request ERGO-Code#2304 from ERGO-Code/pr-2304

Now setting correct values for the dimensions of `Highs::standard_form_matrix_`

Author: jajhall

check/TestHighsParallel.cpp

@@ -24,8 +24,8 @@ int64_t fib(const int64_t n) {
   if (n <= 20) return fib_sequential(n);
 
   int64_t n1;
-  parallel::spawn([&]() { 
-    n1 = fib(n - 1); 
+  parallel::spawn([&]() {
+    n1 = fib(n - 1);
     TSAN_ANNOTATE_HAPPENS_BEFORE(&n1);
   });
 

check/TestIpx.cpp

@@ -1,4 +1,5 @@
 #include "HCheckConfig.h"
+#include "Highs.h"
 #include "catch.hpp"
 #include "ipm/ipx/ipx_status.h"
 #include "ipm/ipx/lp_solver.h"
@@ -8,8 +9,6 @@
 #include "lp_data/HighsStatus.h"
 #include "parallel/HighsParallel.h"
 
-#include "Highs.h"
-
 // Example for using IPX from its C++ interface. The program solves the Netlib
 // problem afiro.
 

check/TestMipSolver.cpp

@@ -558,7 +558,7 @@ TEST_CASE("MIP-get-saved-solutions", "[highs_test_mip_solver]") {
   const std::vector<HighsObjectiveSolution> saved_objective_and_solution =
       highs.getSavedMipSolutions();
   const HighsInt num_saved_solution = saved_objective_and_solution.size();
-  REQUIRE(num_saved_solution > 0); 
+  REQUIRE(num_saved_solution > 0);
   const HighsInt last_saved_solution = num_saved_solution - 1;
   REQUIRE(saved_objective_and_solution[last_saved_solution].objective ==
           highs.getInfo().objective_function_value);

highs/lp_data/HighsInterface.cpp

@@ -321,6 +321,9 @@ HighsStatus Highs::formStandardFormLp() {
     this->standard_form_matrix_.start_.push_back(
         HighsInt(this->standard_form_matrix_.index_.size()));
   }
+  // Now set correct values for the dimensions of this->standard_form_matrix_
+  this->standard_form_matrix_.num_col_ = int(standard_form_cost_.size());
+  this->standard_form_matrix_.num_row_ = int(standard_form_rhs_.size());
   this->standard_form_valid_ = true;
   highsLogUser(options_.log_options, HighsLogType::kInfo,
                "Standard form LP obtained for LP with (free / lower / upper / "

highs/parallel/HighsSplitDeque.h

@@ -41,9 +41,9 @@
 
 #ifdef TSAN_ENABLED
 #define TSAN_ANNOTATE_HAPPENS_BEFORE(addr) \
-    AnnotateHappensBefore(__FILE__, __LINE__, (void*)(addr))
+  AnnotateHappensBefore(__FILE__, __LINE__, (void*)(addr))
 #define TSAN_ANNOTATE_HAPPENS_AFTER(addr) \
-    AnnotateHappensAfter(__FILE__, __LINE__, (void*)(addr))
+  AnnotateHappensAfter(__FILE__, __LINE__, (void*)(addr))
 extern "C" void AnnotateHappensBefore(const char* f, int l, void* addr);
 extern "C" void AnnotateHappensAfter(const char* f, int l, void* addr);
 #else