Skip to content

Commit d630089

Browse files
authored
Merge pull request ERGO-Code#1784 from fwesselm/neos4LargeBnds
Add two utility functions to HighsDomain.cpp
2 parents ebd456a + 08be39e commit d630089

File tree

17 files changed

+195
-302
lines changed

17 files changed

+195
-302
lines changed

extern/zstr/strict_fstream.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
namespace strict_fstream
1818
{
1919

20-
// Help people out a bit, it seems like this is a common recommenation since
20+
// Help people out a bit, it seems like this is a common recommendation since
2121
// musl breaks all over the place.
2222
#if defined(__NEED_size_t) && !defined(__MUSL__)
2323
#warning "It seems to be recommended to patch in a define for __MUSL__ if you use musl globally: https://www.openwall.com/lists/musl/2013/02/10/5"

src/ipm/ipx/crossover.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Crossover {
4444
// as long as the Crossover object is used.
4545
Crossover(const Control& control);
4646

47-
// First runs the dual push phase; if this was succesful, then runs the
47+
// First runs the dual push phase; if this was successful, then runs the
4848
// primal push phase.
4949
//
5050
// weights: Must either be NULL or an array of size n+m.

src/ipm/ipx/forrest_tomlin.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace ipx {
1111

1212
// Generic implementation of the Forrest-Tomlin update [1] that can be used with
1313
// any LU factorization. The implementation does not exploit hypersparsity,
14-
// which exludes its use for such problems. For non-hypersparse problems the
14+
// which excludes its use for such problems. For non-hypersparse problems the
1515
// implementation is better suited than BASICLU, however, because it stores L
1616
// and U in compressed form with permuted indices; hence solving triangular
1717
// systems with a dense rhs/lhs accesses memory contiguously. BASICLU could not

src/ipm/ipx/indexed_vector.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace ipx {
2424
// otherwise.
2525
//
2626
// When modifying the vector changes its pattern (e.g. by writing to v[i] for an
27-
// arbitray index i), you have to invalidate the pattern or provide the new one.
27+
// arbitrary index i), you have to invalidate the pattern or provide the new one.
2828

2929
class IndexedVector {
3030
public:

src/ipm/ipx/iterate.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ void Iterate::Postprocess() {
279279

280280
// For fixed variables compute xl[j] and xu[j] from x[j]. If the lower and
281281
// upper bound are equal, set zl[j] or zu[j] such that the variable is dual
282-
// feasibile. Otherwise leave them zero.
282+
// feasible. Otherwise leave them zero.
283283
for (Int j = 0; j < n+m; j++) {
284284
if (StateOf(j) == State::fixed) {
285285
xl_[j] = x_[j] - lb[j];

src/ipm/ipx/iterate.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class Iterate {
7777
double zl(Int j) const { return zl_[j]; }
7878
double zu(Int j) const { return zu_[j]; }
7979

80-
// Returns const rerefences to the residual vectors
80+
// Returns const references to the residual vectors
8181
// rb = b-AI*x,
8282
// rl = lb-x+xl,
8383
// ru = ub-x-xu,
@@ -155,7 +155,7 @@ class Iterate {
155155
double presidual() const;
156156
double dresidual() const;
157157

158-
// copmlementarity() returns the sum of the pairwise complementarity
158+
// complementarity() returns the sum of the pairwise complementarity
159159
// products xl[j]*zl[j] and xu[j]*zu[j] from all barrier terms. mu()
160160
// returns the average, mu_min() the minimum and mu_max() the maximum.
161161
double complementarity() const;

src/ipm/ipx/lu_factorization.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class LuFactorization {
3838
// kLuDependencyTol as absolute pivot tolerance and to
3939
// remove columns from the active submatrix
4040
// immediately when all entries became smaller than
41-
// the abolute pivot tolerance. Need not be supported
41+
// the absolute pivot tolerance. Need not be supported
4242
// by the implementation.
4343
// @L, @U: return the matrix factors with sorted indices. The objects are
4444
// resized as necessary.

src/ipm/ipx/lu_update.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class LuUpdate {
2525
// kLuDependencyTol as absolute pivot tolerance and to
2626
// remove columns from the active submatrix
2727
// immediately when all entries became smaller than
28-
// the abolute pivot tolerance. Need not be supported
28+
// the absolute pivot tolerance. Need not be supported
2929
// by the implementation.
3030
//
3131
// Factorize() cannot fail other than for out of memory, in which case

src/ipm/ipx/sparse_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace ipx {
1616
// have previously been unmarked; they are marked now and newtop
1717
// is returned.
1818
// @marked, @marker Node i is "marked" iff @marked[i] == @marker.
19-
// @work worksapce of size # rows of A.
19+
// @work workspace of size # rows of A.
2020
//
2121
// The code has been copied and adapted from cs_dfs.c, included in the CSPARSE
2222
// package [1].

src/lp_data/HighsInterface.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2198,7 +2198,7 @@ void Highs::formIllConditioningLp0(HighsLp& ill_conditioning_lp,
21982198
ill_conditioning_matrix.value_.push_back(1.0);
21992199
ill_conditioning_matrix.start_.push_back(
22002200
HighsInt(ill_conditioning_matrix.index_.size()));
2201-
// Subracting x_- with cost 1
2201+
// Subtracting x_- with cost 1
22022202
ill_conditioning_lp.col_cost_.push_back(1);
22032203
ill_conditioning_lp.col_lower_.push_back(0);
22042204
ill_conditioning_lp.col_upper_.push_back(kHighsInf);
@@ -2312,7 +2312,7 @@ void Highs::formIllConditioningLp1(HighsLp& ill_conditioning_lp,
23122312
}
23132313
assert(ill_conditioning_lp.num_col_ == incumbent_num_row);
23142314
if (constraint) {
2315-
// Add the identiy matrix for constraint y - u + w = 0
2315+
// Add the identity matrix for constraint y - u + w = 0
23162316
for (HighsInt iRow = 0; iRow < incumbent_num_row; iRow++) {
23172317
ill_conditioning_matrix.index_.push_back(iRow);
23182318
ill_conditioning_matrix.value_.push_back(1.0);

0 commit comments

Comments
 (0)