Skip to content

Integrate HiGHS and few minor fixes from Augmenta #5150

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

Open
PedramHooshangiAUGAI wants to merge 10 commits into
base: main
Choose a base branch
from
+13 −4
Open

Integrate HiGHS and few minor fixes from Augmenta #5150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
64cfbc5
ACORN-11226: Complete HiGHS v1.12.0 integration
PedramHooshangiAUGAI Feb 19, 2026
87bc6d9
ACORN-11226: Fix HiGHS references and add IDE support
PedramHooshangiAUGAI Feb 19, 2026
2f0a0c9
Merge pull request #4 from augmenta-ai/pedram/ACORN-11226-UpdateORTools
PedramHooshangiAUGAI Feb 20, 2026
f637202
ACORN-11869: Populate variable values for FEASIBLE status in HiGHS so…
PedramHooshangiAUGAI Mar 17, 2026
f7e5943
Merge pull request #5 from augmenta-ai/pedram/ACORN-11869
PedramHooshangiAUGAI Mar 17, 2026
b5e7afa
Add SCIP debug-build assertion fixes to patch file
PedramHooshangiAUGAI Mar 18, 2026
ae980f0
Merge pull request #6 from augmenta-ai/pedram/ACORN-11869
PedramHooshangiAUGAI Mar 18, 2026
cadaef3
Merge remote-tracking branch 'upstream/main' into pedram/Augmenta
PedramHooshangiAUGAI Apr 30, 2026
a70a825
fix(bazel): update SCIP dependency from v10.0.0 to v10.0.2
PedramHooshangiAUGAI May 6, 2026
16e1ee6
Remove scip-v10.0.2 patch and SCIP git_override from MODULE.bazel
PedramHooshangiAUGAI May 20, 2026
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
5 changes: 5 additions & 0 deletions examples/cpp/uncapacitated_facility_location.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ void RunAllExamples(int32_t facilities, int32_t clients, double fix_cost) {
UncapacitatedFacilityLocation(facilities, clients, fix_cost,
MPSolver::GLPK_MIXED_INTEGER_PROGRAMMING);
#endif
#if defined(USE_HIGHS)
LOG(INFO) << "---- Integer programming example with HiGHS ----";
UncapacitatedFacilityLocation(facilities, clients, fix_cost,
MPSolver::HIGHS_MIXED_INTEGER_PROGRAMMING);
#endif
#if defined(USE_SCIP)
LOG(INFO) << "---- Integer programming example with SCIP ----";
UncapacitatedFacilityLocation(facilities, clients, fix_cost,
Expand Down
1 change: 1 addition & 0 deletions makefiles/Makefile.cpp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ detect_cpp:
@echo USE_COINOR = $(USE_COINOR)
@echo USE_SCIP = $(USE_SCIP)
@echo USE_GLPK = $(USE_GLPK)
@echo USE_HIGHS = $(USE_HIGHS)
@echo USE_CPLEX = $(USE_CPLEX)
ifdef GLPK_ROOT
@echo GLPK_ROOT = $(GLPK_ROOT)
Expand Down
11 changes: 7 additions & 4 deletions ortools/graph/christofides.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ class ChristofidesPathSolver {
public:
enum class MatchingAlgorithm {
MINIMUM_WEIGHT_MATCHING,
#if defined(USE_CBC) || defined(USE_SCIP)
#if defined(USE_CBC) || defined(USE_SCIP) || defined(USE_HIGHS)
MINIMUM_WEIGHT_MATCHING_WITH_MIP,
#endif // defined(USE_CBC) || defined(USE_SCIP)
#endif // defined(USE_CBC) || defined(USE_SCIP) || defined(USE_HIGHS)
MINIMAL_WEIGHT_MATCHING,
};
ChristofidesPathSolver(NodeIndex num_nodes, CostFunction costs);
Expand Down Expand Up @@ -155,7 +155,7 @@ ComputeMinimumWeightMatching(const GraphType& graph,
return match;
}

#if defined(USE_CBC) || defined(USE_SCIP)
#if defined(USE_CBC) || defined(USE_SCIP) || defined(USE_HIGHS)
// Computes a minimum weight perfect matching on an undirected graph using a
// Mixed Integer Programming model.
// TODO(user): Handle infeasible cases if this algorithm is used outside of
Expand Down Expand Up @@ -211,6 +211,9 @@ ComputeMinimumWeightMatchingWithMIP(const GraphType& graph,
#if defined(USE_SCIP)
MPSolver mp_solver("MatchingWithSCIP",
MPSolver::SCIP_MIXED_INTEGER_PROGRAMMING);
#elif defined(USE_HIGHS)
MPSolver mp_solver("MatchingWithHiGHS",
MPSolver::HIGHS_MIXED_INTEGER_PROGRAMMING);
#elif defined(USE_CBC)
MPSolver mp_solver("MatchingWithCBC",
MPSolver::CBC_MIXED_INTEGER_PROGRAMMING);
Expand Down Expand Up @@ -330,7 +333,7 @@ ChristofidesPathSolver<CostType, ArcIndex, NodeIndex, CostFunction>::Solve() {
result->swap(closure_arcs);
break;
}
#endif // defined(USE_CBC) || defined(USE_SCIP)
#endif // defined(USE_CBC) || defined(USE_SCIP) || defined(USE_HIGHS)
case MatchingAlgorithm::MINIMAL_WEIGHT_MATCHING: {
// TODO(user): Cost caching was added and can gain up to 20% but
// increases memory usage; see if we can avoid caching.
Expand Down
Loading