From 57016c1663409cb0166d4aae7c2e08a5c1d737ae Mon Sep 17 00:00:00 2001 From: fwesselm Date: Wed, 2 Sep 2026 14:16:43 +0200 Subject: [PATCH] Fix some typos and format --- CMakeLists.txt | 2 +- check/TestFilereader.cpp | 2 +- check/TestSemiVariables.cpp | 2 +- examples/multiple_objective.py | 2 +- highs/HighsRun.md | 4 ++-- highs/ipm/ipx/starting_basis.h | 2 +- highs/mip/HighsMipSolver.cpp | 4 ++-- highs/mip/MipTimer.h | 8 ++++---- highs/presolve/HPresolve.h | 2 +- highs/simplex/HEkkPrimal.cpp | 2 +- highspy/highspy/highs.py | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06741a51210..145377e0d36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/check/TestFilereader.cpp b/check/TestFilereader.cpp index 564dff0c363..4c8ac1e5e7c 100644 --- a/check/TestFilereader.cpp +++ b/check/TestFilereader.cpp @@ -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. diff --git a/check/TestSemiVariables.cpp b/check/TestSemiVariables.cpp index 89cf9679fc2..e7ff29b0c07 100644 --- a/check/TestSemiVariables.cpp +++ b/check/TestSemiVariables.cpp @@ -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); diff --git a/examples/multiple_objective.py b/examples/multiple_objective.py index 7040a4c4af6..8f218229a42 100644 --- a/examples/multiple_objective.py +++ b/examples/multiple_objective.py @@ -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 diff --git a/highs/HighsRun.md b/highs/HighsRun.md index c1576528663..b86dafe1cd9 100644 --- a/highs/HighsRun.md +++ b/highs/HighsRun.md @@ -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 diff --git a/highs/ipm/ipx/starting_basis.h b/highs/ipm/ipx/starting_basis.h index 308d9d5450f..f3cdca0e931 100644 --- a/highs/ipm/ipx/starting_basis.h +++ b/highs/ipm/ipx/starting_basis.h @@ -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); diff --git a/highs/mip/HighsMipSolver.cpp b/highs/mip/HighsMipSolver.cpp index 315cb5864a2..c9cc352fc3b 100644 --- a/highs/mip/HighsMipSolver.cpp +++ b/highs/mip/HighsMipSolver.cpp @@ -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( diff --git a/highs/mip/MipTimer.h b/highs/mip/MipTimer.h index 83d65bd33d6..4c201858857 100644 --- a/highs/mip/MipTimer.h +++ b/highs/mip/MipTimer.h @@ -33,7 +33,7 @@ enum iClockMip : int { kMipClockPerformAging1, kMipClockDive, kMipClockOpenNodesToQueue0, - kMipClockDomainPropgate, + kMipClockDomainPropagate, kMipClockPruneInfeasibleNodes, kMipClockUpdateLocalDomain, kMipClockNodeSearch, @@ -182,7 +182,7 @@ inline void initialiseMipProfilingNames(std::vector& 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"; @@ -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"); @@ -546,7 +546,7 @@ class MipTimer { void reportMipSearchClock(const HighsTimerClock& mip_timer_clock) { const std::vector mip_clock_list{ kMipClockPerformAging1, kMipClockDive, - kMipClockOpenNodesToQueue0, kMipClockDomainPropgate, + kMipClockOpenNodesToQueue0, kMipClockDomainPropagate, kMipClockPruneInfeasibleNodes, kMipClockUpdateLocalDomain, kMipClockNodeSearch, // kMipClock@ diff --git a/highs/presolve/HPresolve.h b/highs/presolve/HPresolve.h index 871a69a223b..255460482c4 100644 --- a/highs/presolve/HPresolve.h +++ b/highs/presolve/HPresolve.h @@ -516,7 +516,7 @@ class HPresolve { Result removeDoubletonEquations(HighsPostsolveStack& postsolve_stack); Result strengthenInequalities(HighsPostsolveStack& postsolve_stack, - HighsInt& num_strenghtened); + HighsInt& num_strengthened); Result detectImpliedIntegers(); diff --git a/highs/simplex/HEkkPrimal.cpp b/highs/simplex/HEkkPrimal.cpp index 01fb0188fc7..3076fba4e4b 100644 --- a/highs/simplex/HEkkPrimal.cpp +++ b/highs/simplex/HEkkPrimal.cpp @@ -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, diff --git a/highspy/highspy/highs.py b/highspy/highspy/highs.py index 08cf30f4752..f651025cb53 100644 --- a/highspy/highspy/highs.py +++ b/highspy/highspy/highs.py @@ -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