Skip to content

Commit 3b8074d

Browse files
jajhalljajhall
authored
Merge pull request #2539 from ERGO-Code/headers-mip-final-log
Added/updated HiGHS header and eliminated some trivial MIP logging
2 parents 0859510 + c5e2b14 commit 3b8074d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+281
-96
lines changed

‎docs/HiGHS_CopyrightHeaderUpdateAll‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,23 @@
66
./HiGHS_CopyrightHeader.pl ../highs/interfaces/*.hpp
77
./HiGHS_CopyrightHeader.pl ../highs/io/*.cpp
88
./HiGHS_CopyrightHeader.pl ../highs/io/*.h
9-
./HiGHS_CopyrightHeader.pl ../highs/mip/*.cpp
10-
./HiGHS_CopyrightHeader.pl ../highs/mip/*.h
119
./HiGHS_CopyrightHeader.pl ../highs/lp_data/*.h
1210
./HiGHS_CopyrightHeader.pl ../highs/lp_data/*.cpp
13-
./HiGHS_CopyrightHeader.pl ../highs/pdlp/*.cpp
11+
./HiGHS_CopyrightHeader.pl ../highs/mip/*.cpp
12+
./HiGHS_CopyrightHeader.pl ../highs/mip/*.h
13+
./HiGHS_CopyrightHeader.pl ../highs/mip/*.hh
14+
./HiGHS_CopyrightHeader.pl ../highs/model/*.h
15+
./HiGHS_CopyrightHeader.pl ../highs/model/*.cpp
16+
./HiGHS_CopyrightHeader.pl ../highs/parallel/*.h
17+
./HiGHS_CopyrightHeader.pl ../highs/parallel/*.cpp
1418
./HiGHS_CopyrightHeader.pl ../highs/pdlp/*.h
19+
./HiGHS_CopyrightHeader.pl ../highs/pdlp/*.cpp
20+
./HiGHS_CopyrightHeader.pl ../highs/pdlp/hipdlp/*.hpp
21+
./HiGHS_CopyrightHeader.pl ../highs/pdlp/hipdlp/*.cc
1522
./HiGHS_CopyrightHeader.pl ../highs/presolve/*.cpp
1623
./HiGHS_CopyrightHeader.pl ../highs/presolve/*.h
24+
./HiGHS_CopyrightHeader.pl ../highs/qpsolver/*.cpp
25+
./HiGHS_CopyrightHeader.pl ../highs/qpsolver/*.hpp
1726
./HiGHS_CopyrightHeader.pl ../highs/simplex/*.h
1827
./HiGHS_CopyrightHeader.pl ../highs/simplex/*.cpp
1928
./HiGHS_CopyrightHeader.pl ../highs/test_kkt/*.h

‎highs/mip/HighsMipSolver.cpp‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -851,14 +851,16 @@ void HighsMipSolver::cleanupSolve() {
851851
" Repair LPs 0\n");
852852
}
853853
highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
854-
" LP iterations %llu\n"
855-
" %llu (strong br.)\n"
856-
" %llu (separation)\n"
857-
" %llu (heuristics)\n",
858-
(long long unsigned)mipdata_->total_lp_iterations,
859-
(long long unsigned)mipdata_->sb_lp_iterations,
860-
(long long unsigned)mipdata_->sepa_lp_iterations,
861-
(long long unsigned)mipdata_->heuristic_lp_iterations);
854+
" LP iterations %llu\n",
855+
(long long unsigned)mipdata_->total_lp_iterations);
856+
if (mipdata_->total_lp_iterations)
857+
highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
858+
" %llu (strong br.)\n"
859+
" %llu (separation)\n"
860+
" %llu (heuristics)\n",
861+
(long long unsigned)mipdata_->sb_lp_iterations,
862+
(long long unsigned)mipdata_->sepa_lp_iterations,
863+
(long long unsigned)mipdata_->heuristic_lp_iterations);
862864

863865
if (!timeless_log) analysis_.reportMipTimer();
864866

‎highs/mip/feasibilityjump.hh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2+
/* */
3+
/* This file is part of the HiGHS linear optimization suite */
4+
/* */
5+
/* Available as open-source under the MIT License */
6+
/* */
7+
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
18
#include <algorithm>
29
#include <cassert>
310
#include <climits>

‎highs/model/HighsHessian.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
/* */
33
/* This file is part of the HiGHS linear optimization suite */
44
/* */
5-
/* Written and engineered 2008-2021 at the University of Edinburgh */
6-
/* */
75
/* Available as open-source under the MIT License */
86
/* */
9-
/* Authors: Julian Hall, Ivet Galabova, Qi Huangfu, Leona Gottwald */
10-
/* and Michael Feldmeier */
11-
/* */
127
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
138
/**@file lp_data/HighsHessian.cpp
149
* @brief

‎highs/model/HighsHessian.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
/* */
33
/* This file is part of the HiGHS linear optimization suite */
44
/* */
5-
/* Written and engineered 2008-2021 at the University of Edinburgh */
6-
/* */
75
/* Available as open-source under the MIT License */
86
/* */
9-
/* Authors: Julian Hall, Ivet Galabova, Qi Huangfu, Leona Gottwald */
10-
/* and Michael Feldmeier */
11-
/* */
127
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
138
/**@file model/HighsHessian.h
149
* @brief

‎highs/model/HighsHessianUtils.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
/* */
33
/* This file is part of the HiGHS linear optimization suite */
44
/* */
5-
/* Written and engineered 2008-2021 at the University of Edinburgh */
6-
/* */
75
/* Available as open-source under the MIT License */
86
/* */
9-
/* Authors: Julian Hall, Ivet Galabova, Qi Huangfu, Leona Gottwald */
10-
/* and Michael Feldmeier */
11-
/* */
127
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
138
/**@file lp_data/HighsHessianUtils.cpp
149
* @brief

‎highs/model/HighsHessianUtils.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
/* */
33
/* This file is part of the HiGHS linear optimization suite */
44
/* */
5-
/* Written and engineered 2008-2021 at the University of Edinburgh */
6-
/* */
75
/* Available as open-source under the MIT License */
86
/* */
9-
/* Authors: Julian Hall, Ivet Galabova, Qi Huangfu, Leona Gottwald */
10-
/* and Michael Feldmeier */
11-
/* */
127
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
138
/**@file model/HighsHessianUtils.h
149
* @brief Class-independent utilities for HiGHS

‎highs/model/HighsModel.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
/* */
33
/* This file is part of the HiGHS linear optimization suite */
44
/* */
5-
/* Written and engineered 2008-2021 at the University of Edinburgh */
6-
/* */
75
/* Available as open-source under the MIT License */
86
/* */
9-
/* Authors: Julian Hall, Ivet Galabova, Qi Huangfu, Leona Gottwald */
10-
/* and Michael Feldmeier */
11-
/* */
127
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
138
/**@file lp_data/HighsModel.cpp
149
* @brief

‎highs/model/HighsModel.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
/* */
33
/* This file is part of the HiGHS linear optimization suite */
44
/* */
5-
/* Written and engineered 2008-2021 at the University of Edinburgh */
6-
/* */
75
/* Available as open-source under the MIT License */
86
/* */
9-
/* Authors: Julian Hall, Ivet Galabova, Qi Huangfu, Leona Gottwald */
10-
/* and Michael Feldmeier */
11-
/* */
127
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
138
/**@file model/HighsModel.h
149
* @brief

‎highs/parallel/HighsBinarySemaphore.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
/* */
33
/* This file is part of the HiGHS linear optimization suite */
44
/* */
5-
/* Written and engineered 2008-2021 at the University of Edinburgh */
6-
/* */
75
/* Available as open-source under the MIT License */
86
/* */
9-
/* Authors: Julian Hall, Ivet Galabova, Qi Huangfu, Leona Gottwald */
10-
/* and Michael Feldmeier */
11-
/* */
127
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
138

149
#ifndef HIGHS_BINARY_SEMAPHORE_H_

0 commit comments

Comments
 (0)