Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ if (HIGHS_GPU_LIB)
endif()

if(CUPDLP_GPU AND CMAKE_VERSION VERSION_LESS "3.25.0")
message("CUPDLP FindCUDAConf requires CMake version minumum 3.24. Please use a higher version of CMake.")
message("CUPDLP FindCUDAConf requires CMake version minimum 3.24. Please use a higher version of CMake.")
endif()

# if (NOT LINUX)
Expand Down
2 changes: 1 addition & 1 deletion check/TestFilereader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ TEST_CASE("filereader-edge-cases", "[highs_filereader]") {

if (test_garbage_lp) {
// Since #2316, reading an LP file of garbage yields an empty
// model, since the absence of an objecive is (rightly) no
// model, since the absence of an objective is (rightly) no
// longer an error. However the LP file reader should fail due
// to the requirement that a LP format file must begin with a
// keyword.
Expand Down
2 changes: 1 addition & 1 deletion check/TestSemiVariables.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TEST_CASE("semi-variable-model", "[highs_test_semi_variables]") {
lp.col_cost_[semi_col] = semi_col_cost;
lp.model_name_ = "semi-variable-model";
optimal_objective_function_value = 6.83333;
// Legal to have infinte upper bounds on semi-variables
// Legal to have infinite upper bounds on semi-variables
lp.col_upper_[semi_col] = inf;
return_status = highs.passModel(model);
REQUIRE(return_status == HighsStatus::kOk);
Expand Down
2 changes: 1 addition & 1 deletion examples/multiple_objective.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
h.clearLinearObjectives()
h.addLinearObjective(linear_objective0)
h.addLinearObjective(linear_objective1)
# Objectives as before, but absolute tolerence for f0 now -1 (negative
# Objectives as before, but absolute tolerance for f0 now -1 (negative
# => ignored) so relative tolerance of 0.05 is used
#
# Lexicographically: HiGHS
Expand Down
4 changes: 2 additions & 2 deletions highs/HighsRun.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ returning from `Highs::run()`.

The `HighsLp` class contains data values and structures that cannot be handled explicitly by the solvers.

- If a variable has an excessivly large objective cost, this is
interpreted as being infinte, and handled in
- If a variable has an excessively large objective cost, this is
interpreted as being infinite, and handled in
`Highs::handleInfCost()` by fixing the variable at its lower or
upper bound (when finite) according to the sign of the cost and the
sense of the optimization, and zeroing the cost. After solving the
Expand Down
2 changes: 1 addition & 1 deletion highs/ipm/ipx/starting_basis.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace ipx {
// The method calls ConstructBasisFromWeights() using the interior point
// scaling factors as column weights. If a variable gets status BASIC_FREE or
// NONBASIC_FIXED, then its state in @iterate is changed accordingly to free or
// fixed. On return info->errflag is nonzero if an error occured.
// fixed. On return info->errflag is nonzero if an error occurred.
//
void StartingBasis(Iterate* iterate, Basis* basis, Info* info);

Expand Down
4 changes: 2 additions & 2 deletions highs/mip/HighsMipSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1096,11 +1096,11 @@ void HighsMipSolver::run() {
assert(!nodesInstalled());

// Sync global information
profiling_->start(kMipClockDomainPropgate);
profiling_->start(kMipClockDomainPropagate);
syncPools(search_indices);
syncGlobalDomain(search_indices);
mipdata_->getDomain().propagate();
profiling_->stop(kMipClockDomainPropgate);
profiling_->stop(kMipClockDomainPropagate);

profiling_->start(kMipClockPruneInfeasibleNodes);
mipdata_->pruned_treeweight += mipdata_->nodequeue.pruneInfeasibleNodes(
Expand Down
8 changes: 4 additions & 4 deletions highs/mip/MipTimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ enum iClockMip : int {
kMipClockPerformAging1,
kMipClockDive,
kMipClockOpenNodesToQueue0,
kMipClockDomainPropgate,
kMipClockDomainPropagate,
kMipClockPruneInfeasibleNodes,
kMipClockUpdateLocalDomain,
kMipClockNodeSearch,
Expand Down Expand Up @@ -182,7 +182,7 @@ inline void initialiseMipProfilingNames(std::vector<std::string>& name) {
name[kMipClockPerformAging1] = "Perform aging 1";
name[kMipClockDive] = "Dive";
name[kMipClockOpenNodesToQueue0] = "Open nodes to queue 0";
name[kMipClockDomainPropgate] = "Domain propagate";
name[kMipClockDomainPropagate] = "Domain propagate";
name[kMipClockPruneInfeasibleNodes] = "Prune infeasible nodes";
name[kMipClockUpdateLocalDomain] = "Update local domain";
name[kMipClockNodeSearch] = "Node search";
Expand Down Expand Up @@ -342,7 +342,7 @@ class MipTimer {
clock[kMipClockDive] = timer_pointer->clock_def("Dive");
clock[kMipClockOpenNodesToQueue0] =
timer_pointer->clock_def("Open nodes to queue 0");
clock[kMipClockDomainPropgate] =
clock[kMipClockDomainPropagate] =
timer_pointer->clock_def("Domain propagate");
clock[kMipClockPruneInfeasibleNodes] =
timer_pointer->clock_def("Prune infeasible nodes");
Expand Down Expand Up @@ -546,7 +546,7 @@ class MipTimer {
void reportMipSearchClock(const HighsTimerClock& mip_timer_clock) {
const std::vector<HighsInt> mip_clock_list{
kMipClockPerformAging1, kMipClockDive,
kMipClockOpenNodesToQueue0, kMipClockDomainPropgate,
kMipClockOpenNodesToQueue0, kMipClockDomainPropagate,
kMipClockPruneInfeasibleNodes, kMipClockUpdateLocalDomain,
kMipClockNodeSearch,
// kMipClock@
Expand Down
2 changes: 1 addition & 1 deletion highs/presolve/HPresolve.h
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ class HPresolve {
Result removeDoubletonEquations(HighsPostsolveStack& postsolve_stack);

Result strengthenInequalities(HighsPostsolveStack& postsolve_stack,
HighsInt& num_strenghtened);
HighsInt& num_strengthened);

Result detectImpliedIntegers();

Expand Down
2 changes: 1 addition & 1 deletion highs/simplex/HEkkPrimal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2853,7 +2853,7 @@ void HEkkPrimal::shiftBound(const bool lower, const HighsInt iVar,
double error = std::fabs(new_infeasibility + feasibility);
highsLogDev(ekk_instance_.options_->log_options, HighsLogType::kInfo,
"HEkkPrimal::shiftBound Value(%4d) = %10.4g exceeds %s: "
"random_value = %g; value = %g; "
"old_bound = %g; random_value = %g; value = %g; "
"feasibility = %g; infeasibility = %g; shift = %g; bound = %g; "
"new_infeasibility = %g with error %g\n",
int(iVar), value, type.c_str(), old_bound, random_value, value,
Expand Down
2 changes: 1 addition & 1 deletion highspy/highspy/highs.py
Original file line number Diff line number Diff line change
Expand Up @@ -2021,7 +2021,7 @@ def name(self, value: str):
# Note: we only allow LHS/RHS to be set once via comparisons (>=,==,<=), otherwise it gets confusing!
# e.g, for (0 <= x <= 1) <= 2, should this be:
# 0 <= x <= 1 (i.e., tighter bound, x <= 1 and x <= 2 implies x <= 1),
# or, 0 <= x <= 2 (i.e., last comparision overrides previous)?
# or, 0 <= x <= 2 (i.e., last comparison overrides previous)?
#
# Throwing an error makes it obvious to the user. Note we can still set via addition,
# e.g., (x <= 1) + (y <= 5) to get x + y <= 6
Expand Down
Loading