Skip to content

Commit 8a85830

Browse files
committed
Update comments. Remove unneeded import
1 parent db6c8ce commit 8a85830

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

highs/mip/HighsCutGeneration.h

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "util/HighsCDouble.h"
2121
#include "util/HighsInt.h"
2222
#include "util/HighsRandom.h"
23-
#include "util/HighsSparseVectorSum.h"
2423

2524
class HighsLpRelaxation;
2625
class HighsTransformedLp;
@@ -119,20 +118,20 @@ class HighsCutGeneration {
119118

120119
/// Single Node Flow Relaxation for flow cover cuts
121120
struct SNFRelaxation {
122-
HighsInt numNnzs; // number of nonzeros
123-
std::vector<HighsInt> coef; // coefficients of cols in SNFR
124-
std::vector<double> vubCoef; // coefficients in vub of cols in SNFR
125-
std::vector<double> binSolval; // vub bin col sol in SNFR
126-
std::vector<double> contSolval; // real sol in SNFR
127-
std::vector<HighsInt> origBinCols; // orig bin col used in SNFR
128-
std::vector<HighsInt> origContCols; // orig cont cols used in SNFR
129-
std::vector<double> aggrBinCoef; // aggr coef of orignal bin-col in SNFR
130-
std::vector<double> aggrContCoef; // aggr coef of original cont-col in SNFR
131-
std::vector<double> aggrConstant; // aggr original constant in SNFR
132-
133-
std::vector<HighsInt> flowCoverStatus; // (+1) in fcover (-1) not in fcover
134-
double rhs;
135-
double lambda;
121+
HighsInt numNnzs; // |N-| + |N+|
122+
std::vector<HighsInt> coef; // (+-1) coefficient of col in SNFR
123+
std::vector<double> vubCoef; // u_j in y'_j <= u_j x_j in SNFR
124+
std::vector<double> binSolval; // lp[x_j], y'_j <= u_j x_j in SNFR
125+
std::vector<double> contSolval; // lp[y'_j] in y'_j <= u_j x_j in SNFR
126+
std::vector<HighsInt> origBinCols; // orig x_i, y'_j <= u_j x_j in SNFR
127+
std::vector<HighsInt> origContCols; // orig y_i used to make y'_j in SNFR
128+
std::vector<double> aggrBinCoef; // c_i row coef of x_i in orig aggrrow
129+
std::vector<double> aggrContCoef; // a_i row coef of y_i in orig aggrrow
130+
std::vector<double> aggrConstant; // constant shift used in SNFR transform
131+
132+
std::vector<HighsInt> flowCoverStatus; // (+1) in f-cover (-1) notin f-cover
133+
double rhs; // in \sum_{j \in N+} y'_j - \sum_{j \in N-} y'_j <= b
134+
double lambda; // in sum_{j in C+} u_j - sum_{j in C-} u_j = b + lambda
136135
};
137136

138137
private:

highs/mip/HighsTransformedLp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "util/HighsInt.h"
2424
#include "util/HighsSparseVectorSum.h"
2525

26-
class HighsCutGeneration;
2726
class HighsLpRelaxation;
2827

2928
/// Helper class to compute single-row relaxations from the current LP

0 commit comments

Comments
 (0)