Skip to content

Commit 7689da7

Browse files
authored
Merge pull request ERGO-Code#1798 from ERGO-Code/fix-warnings
fix wrong declaration of highsCompilationDate(), some compiler warnings, and a comment header
2 parents 43329e5 + 0bd9271 commit 7689da7

File tree

7 files changed

+15
-14
lines changed

7 files changed

+15
-14
lines changed

src/Highs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ HighsInt highsVersionMajor();
3737
HighsInt highsVersionMinor();
3838
HighsInt highsVersionPatch();
3939
const char* highsGithash();
40+
const char* highsCompilationDate();
4041

4142
/**
4243
* @brief Class to set parameters and run HiGHS
@@ -1216,7 +1217,6 @@ class Highs {
12161217
* @brief Return compilation date
12171218
*/
12181219
std::string compilationDate() const { return "deprecated"; }
1219-
const char* highsCompilationDate();
12201220

12211221
HighsStatus setLogCallback(void (*user_log_callback)(HighsLogType,
12221222
const char*, void*),

src/lp_data/Highs.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2320,12 +2320,12 @@ HighsStatus Highs::changeColsIntegrality(const HighsInt from_col,
23202320
return returnFromHighs(return_status);
23212321
}
23222322

2323-
HighsStatus analyseSetCreateError(HighsLogOptions log_options,
2324-
const std::string method,
2325-
const HighsInt create_error,
2326-
const bool ordered,
2327-
const HighsInt num_set_entries,
2328-
const HighsInt dimension) {
2323+
static HighsStatus analyseSetCreateError(HighsLogOptions log_options,
2324+
const std::string method,
2325+
const HighsInt create_error,
2326+
const bool ordered,
2327+
const HighsInt num_set_entries,
2328+
const HighsInt dimension) {
23292329
if (create_error == kIndexCollectionCreateIllegalSetSize) {
23302330
highsLogUser(log_options, HighsLogType::kError,
23312331
"Set supplied to Highs::%s has illegal size of %d\n",

src/lp_data/HighsCallbackStruct.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
12
/* */
23
/* This file is part of the HiGHS linear optimization suite */
34
/* */

src/qpsolver/a_quass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "qpsolver/feasibility_highs.hpp"
55
#include "qpsolver/feasibility_bounded.hpp"
66

7-
QpAsmStatus quass2highs(Instance& instance,
7+
static QpAsmStatus quass2highs(Instance& instance,
88
Settings& settings,
99
Statistics& stats,
1010
QpModelStatus& qp_model_status,

src/qpsolver/feasibility_bounded.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ static void computeStartingPointBounded(Instance& instance,
1818
L.resize(instance.num_var * instance.num_var);
1919

2020
// compute cholesky factorization of Q
21-
for (size_t col = 0; col < instance.num_var; col++) {
22-
for (size_t idx = instance.Q.mat.start[col]; idx < instance.Q.mat.start[col+1]; idx++) {
21+
for (size_t col = 0; col < (size_t)instance.num_var; col++) {
22+
for (size_t idx = instance.Q.mat.start[col]; idx < (size_t)instance.Q.mat.start[col+1]; idx++) {
2323
double sum = 0;
2424
size_t row = instance.Q.mat.index[idx];
2525
if (row == col) {

src/qpsolver/quass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,12 @@ static double compute_dual_violation(Instance& instance, QpVector& primal, QpVec
266266
}
267267
#endif
268268

269-
bool check_reinvert_due(Basis& basis) {
269+
static bool check_reinvert_due(Basis& basis) {
270270
// reinvert can be triggered by basis
271271
return basis.getreinversionhint();
272272
}
273273

274-
void reinvert(Basis& basis, CholeskyFactor& factor, Gradient& grad, ReducedCosts& rc, ReducedGradient& rg, std::unique_ptr<Pricing>& pricing) {
274+
static void reinvert(Basis& basis, CholeskyFactor& factor, Gradient& grad, ReducedCosts& rc, ReducedGradient& rg, std::unique_ptr<Pricing>& pricing) {
275275
basis.rebuild();
276276
factor.recompute();
277277
grad.recompute();

src/qpsolver/runtime.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ struct Runtime {
2626

2727
Runtime(Instance& inst, Statistics& stats)
2828
: instance(inst),
29+
statistics(stats),
2930
primal(QpVector(instance.num_var)),
3031
rowactivity(QpVector(instance.num_con)),
3132
dualvar(instance.num_var),
3233
dualcon(instance.num_con),
3334
status_var(instance.num_var),
34-
status_con(instance.num_con),
35-
statistics(stats) {}
35+
status_con(instance.num_con) {}
3636
};
3737

3838
#endif

0 commit comments

Comments
 (0)