Skip to content

Now setting correct values for the dimensions of Highs::standard_form_matrix_ #2304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jajhall merged 1 commit into from
Apr 24, 2025
Merged

Now setting correct values for the dimensions of Highs::standard_form_matrix_ #2304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions check/TestHighsParallel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down
3 changes: 1 addition & 2 deletions check/TestIpx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion check/TestMipSolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions highs/lp_data/HighsInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_
Copy link
Member Author

@jajhall jajhall Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only inserted these three lines. I guess the other changes are down to clang-format

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 / "
Expand Down
4 changes: 2 additions & 2 deletions highs/parallel/HighsSplitDeque.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading