Skip to content

Commit 2ea8aec

Browse files
committed
Fix typos and format
1 parent 514955d commit 2ea8aec

11 files changed

Lines changed: 201 additions & 178 deletions

File tree

CMakeLists.txt

Lines changed: 186 additions & 163 deletions
Large diffs are not rendered by default.

check/TestFilereader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ TEST_CASE("filereader-edge-cases", "[highs_filereader]") {
8989

9090
if (test_garbage_lp) {
9191
// Since #2316, reading an LP file of garbage yields an empty
92-
// model, since the absence of an objecive is (rightly) no
92+
// model, since the absence of an objective is (rightly) no
9393
// longer an error. However the LP file reader should fail due
9494
// to the requirement that a LP format file must begin with a
9595
// keyword.

check/TestSemiVariables.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ TEST_CASE("semi-variable-model", "[highs_test_semi_variables]") {
2828
lp.col_cost_[semi_col] = semi_col_cost;
2929
lp.model_name_ = "semi-variable-model";
3030
optimal_objective_function_value = 6.83333;
31-
// Legal to have infinte upper bounds on semi-variables
31+
// Legal to have infinite upper bounds on semi-variables
3232
lp.col_upper_[semi_col] = inf;
3333
return_status = highs.passModel(model);
3434
REQUIRE(return_status == HighsStatus::kOk);

examples/multiple_objective.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
h.clearLinearObjectives()
9999
h.addLinearObjective(linear_objective0)
100100
h.addLinearObjective(linear_objective1)
101-
# Objectives as before, but absolute tolerence for f0 now -1 (negative
101+
# Objectives as before, but absolute tolerance for f0 now -1 (negative
102102
# => ignored) so relative tolerance of 0.05 is used
103103
#
104104
# Lexicographically: HiGHS

highs/HighsRun.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ returning from `Highs::run()`.
5353

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

56-
- If a variable has an excessivly large objective cost, this is
57-
interpreted as being infinte, and handled in
56+
- If a variable has an excessively large objective cost, this is
57+
interpreted as being infinite, and handled in
5858
`Highs::handleInfCost()` by fixing the variable at its lower or
5959
upper bound (when finite) according to the sign of the cost and the
6060
sense of the optimization, and zeroing the cost. After solving the

highs/ipm/ipx/starting_basis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace ipx {
3030
// The method calls ConstructBasisFromWeights() using the interior point
3131
// scaling factors as column weights. If a variable gets status BASIC_FREE or
3232
// NONBASIC_FIXED, then its state in @iterate is changed accordingly to free or
33-
// fixed. On return info->errflag is nonzero if an error occured.
33+
// fixed. On return info->errflag is nonzero if an error occurred.
3434
//
3535
void StartingBasis(Iterate* iterate, Basis* basis, Info* info);
3636

highs/mip/HighsMipSolver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,11 +1096,11 @@ void HighsMipSolver::run() {
10961096
assert(!nodesInstalled());
10971097

10981098
// Sync global information
1099-
profiling_->start(kMipClockDomainPropgate);
1099+
profiling_->start(kMipClockDomainPropagate);
11001100
syncPools(search_indices);
11011101
syncGlobalDomain(search_indices);
11021102
mipdata_->getDomain().propagate();
1103-
profiling_->stop(kMipClockDomainPropgate);
1103+
profiling_->stop(kMipClockDomainPropagate);
11041104

11051105
profiling_->start(kMipClockPruneInfeasibleNodes);
11061106
mipdata_->pruned_treeweight += mipdata_->nodequeue.pruneInfeasibleNodes(

highs/mip/MipTimer.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ enum iClockMip : int {
3333
kMipClockPerformAging1,
3434
kMipClockDive,
3535
kMipClockOpenNodesToQueue0,
36-
kMipClockDomainPropgate,
36+
kMipClockDomainPropagate,
3737
kMipClockPruneInfeasibleNodes,
3838
kMipClockUpdateLocalDomain,
3939
kMipClockNodeSearch,
@@ -182,7 +182,7 @@ inline void initialiseMipProfilingNames(std::vector<std::string>& name) {
182182
name[kMipClockPerformAging1] = "Perform aging 1";
183183
name[kMipClockDive] = "Dive";
184184
name[kMipClockOpenNodesToQueue0] = "Open nodes to queue 0";
185-
name[kMipClockDomainPropgate] = "Domain propagate";
185+
name[kMipClockDomainPropagate] = "Domain propagate";
186186
name[kMipClockPruneInfeasibleNodes] = "Prune infeasible nodes";
187187
name[kMipClockUpdateLocalDomain] = "Update local domain";
188188
name[kMipClockNodeSearch] = "Node search";
@@ -342,7 +342,7 @@ class MipTimer {
342342
clock[kMipClockDive] = timer_pointer->clock_def("Dive");
343343
clock[kMipClockOpenNodesToQueue0] =
344344
timer_pointer->clock_def("Open nodes to queue 0");
345-
clock[kMipClockDomainPropgate] =
345+
clock[kMipClockDomainPropagate] =
346346
timer_pointer->clock_def("Domain propagate");
347347
clock[kMipClockPruneInfeasibleNodes] =
348348
timer_pointer->clock_def("Prune infeasible nodes");
@@ -546,7 +546,7 @@ class MipTimer {
546546
void reportMipSearchClock(const HighsTimerClock& mip_timer_clock) {
547547
const std::vector<HighsInt> mip_clock_list{
548548
kMipClockPerformAging1, kMipClockDive,
549-
kMipClockOpenNodesToQueue0, kMipClockDomainPropgate,
549+
kMipClockOpenNodesToQueue0, kMipClockDomainPropagate,
550550
kMipClockPruneInfeasibleNodes, kMipClockUpdateLocalDomain,
551551
kMipClockNodeSearch,
552552
// kMipClock@

highs/presolve/HPresolve.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ class HPresolve {
516516
Result removeDoubletonEquations(HighsPostsolveStack& postsolve_stack);
517517

518518
Result strengthenInequalities(HighsPostsolveStack& postsolve_stack,
519-
HighsInt& num_strenghtened);
519+
HighsInt& num_strengthened);
520520

521521
Result detectImpliedIntegers();
522522

highs/simplex/HEkkPrimal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2853,7 +2853,7 @@ void HEkkPrimal::shiftBound(const bool lower, const HighsInt iVar,
28532853
double error = std::fabs(new_infeasibility + feasibility);
28542854
highsLogDev(ekk_instance_.options_->log_options, HighsLogType::kInfo,
28552855
"HEkkPrimal::shiftBound Value(%4d) = %10.4g exceeds %s: "
2856-
"random_value = %g; value = %g; "
2856+
"old_bound = %g; random_value = %g; value = %g; "
28572857
"feasibility = %g; infeasibility = %g; shift = %g; bound = %g; "
28582858
"new_infeasibility = %g with error %g\n",
28592859
int(iVar), value, type.c_str(), old_bound, random_value, value,

0 commit comments

Comments
 (0)