Skip to content

Commit 22f165c

Browse files
committed
remove redundant
1 parent b570b0b commit 22f165c

11 files changed

+0
-43
lines changed

check/TestBasis.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,6 @@ TEST_CASE("Basis-singular", "[highs_basis_data]") {
190190
basis.col_status = {HighsBasisStatus::kBasic, HighsBasisStatus::kBasic};
191191
basis.row_status = {HighsBasisStatus::kLower, HighsBasisStatus::kLower};
192192
REQUIRE(highs.setBasis(basis) == HighsStatus::kOk);
193-
194-
highs.resetGlobalScheduler(true);
195193
}
196194

197195
// No commas in test case name.

check/TestCheckSolution.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ TEST_CASE("check-solution", "[highs_check_solution]") {
6868
// Second pass uses sparse format
6969
write_solution_style = kSolutionStyleSparse;
7070
}
71-
72-
highs.resetGlobalScheduler(true);
7371
}
7472

7573
TEST_CASE("check-set-mip-solution", "[highs_check_solution]") {
@@ -410,8 +408,6 @@ TEST_CASE("check-set-illegal-solution", "[highs_check_solution]") {
410408
REQUIRE(highs.setSolution(solution) == HighsStatus::kError);
411409
solution.col_value.assign(lp.num_col_, 0);
412410
REQUIRE(highs.setSolution(solution) == HighsStatus::kOk);
413-
414-
highs.resetGlobalScheduler(true);
415411
}
416412

417413
TEST_CASE("read-miplib-solution", "[highs_check_solution]") {

check/TestFactor.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,6 @@ TEST_CASE("Factor-get-set-invert", "[highs_test_factor]") {
182182
for (basis_change = from_basis_change; basis_change < to_basis_change;
183183
basis_change++)
184184
REQUIRE(iterate(variable_out[basis_change], variable_in[basis_change]));
185-
186-
highs.resetGlobalScheduler(true);
187185
}
188186

189187
HighsInt rowOut(const HighsInt variable_out) {

check/TestFilereader.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ void freeFixedModelTest(const std::string model_name) {
164164

165165
bool are_the_same = model_free == model_fixed;
166166
REQUIRE(are_the_same);
167-
168-
highs.resetGlobalScheduler(true);
169167
}
170168

171169
TEST_CASE("filereader-free-format-parser-qp", "[highs_filereader]") {
@@ -199,8 +197,6 @@ TEST_CASE("filereader-free-format-parser-lp", "[highs_filereader]") {
199197

200198
bool are_the_same = lp_free == lp_fixed;
201199
REQUIRE(are_the_same);
202-
203-
highs.resetGlobalScheduler(true);
204200
}
205201

206202
// No commas in test case name.
@@ -304,8 +300,6 @@ TEST_CASE("filereader-integrality-constraints", "[highs_filereader]") {
304300

305301
bool are_the_same = lp_free == lp_fixed;
306302
REQUIRE(are_the_same);
307-
308-
highs.resetGlobalScheduler(true);
309303
}
310304

311305
/*
@@ -428,8 +422,6 @@ TEST_CASE("writeLocalModel", "[highs_filereader]") {
428422
REQUIRE(h.writeLocalModel(model, write_model_file) == HighsStatus::kError);
429423

430424
std::remove(write_model_file.c_str());
431-
432-
h.resetGlobalScheduler(true);
433425
}
434426

435427
TEST_CASE("write-MI-bound-model", "[highs_filereader]") {
@@ -465,8 +457,6 @@ TEST_CASE("mps-warnings", "[highs_filereader]") {
465457
h.setOptionValue("output_flag", dev_run);
466458
HighsStatus return_status = h.readModel(model_file);
467459
REQUIRE(return_status == HighsStatus::kWarning);
468-
469-
h.resetGlobalScheduler(true);
470460
}
471461

472462
TEST_CASE("mps-silly-names", "[highs_filereader]") {
@@ -476,6 +466,4 @@ TEST_CASE("mps-silly-names", "[highs_filereader]") {
476466
h.setOptionValue("output_flag", dev_run);
477467
HighsStatus return_status = h.readModel(model_file);
478468
REQUIRE(return_status == HighsStatus::kOk);
479-
480-
h.resetGlobalScheduler(true);
481469
}

check/TestHighsSparseMatrix.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,4 @@ TEST_CASE("Sparse-matrix-products", "[highs_sparse_matrix]") {
123123

124124
highs.clear();
125125
}
126-
127-
highs.resetGlobalScheduler(true);
128126
}

check/TestHighsVersion.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,4 @@ TEST_CASE("sizeof-highs-int", "[highs_version]") {
5858
#else
5959
REQUIRE(sizeof_highs_int == 4);
6060
#endif
61-
62-
highs.resetGlobalScheduler(true);
6361
}

check/TestIis.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,6 @@ void testMps(std::string& model, const HighsInt iis_strategy,
457457
REQUIRE(num_iis_col == 0);
458458
REQUIRE(num_iis_row == 0);
459459
}
460-
461-
highs.resetGlobalScheduler(true);
462460
}
463461

464462
void testFeasibilityRelaxation(
@@ -474,6 +472,4 @@ void testFeasibilityRelaxation(
474472
HighsStatus::kOk);
475473
REQUIRE(h.getInfo().objective_function_value ==
476474
require_feasibility_objective_function_value);
477-
478-
h.resetGlobalScheduler(true);
479475
}

check/TestLPFileFormat.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,4 @@ TEST_CASE("lp-file-format-quad-no-space", "[LpFileFormat]") {
1919
REQUIRE(highs.readModel(filename) == HighsStatus::kError);
2020

2121
// todo: read the coefficients/variables off the highs model
22-
23-
highs.resetGlobalScheduler(true);
2422
}

check/TestLpModification.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,8 +1980,6 @@ TEST_CASE("resize-integrality", "[highs_data]") {
19801980
REQUIRE(int(integrality.size()) == int(original_num_col + 1));
19811981
}
19821982
}
1983-
1984-
highs.resetGlobalScheduler(true);
19851983
}
19861984

19871985
TEST_CASE("modify-empty-model", "[highs_data]") {
@@ -1992,8 +1990,6 @@ TEST_CASE("modify-empty-model", "[highs_data]") {
19921990
REQUIRE(highs.changeColCost(0, 1) == HighsStatus::kError);
19931991
REQUIRE(highs.changeColBounds(0, 1, 1) == HighsStatus::kError);
19941992
REQUIRE(highs.changeRowBounds(0, 1, 1) == HighsStatus::kError);
1995-
1996-
highs.resetGlobalScheduler(true);
19971993
}
19981994

19991995
TEST_CASE("zero-matrix-entries", "[highs_data]") {
@@ -2011,8 +2007,6 @@ TEST_CASE("zero-matrix-entries", "[highs_data]") {
20112007
lp.a_matrix_.index_ = {0, 1, 0, 1};
20122008
lp.a_matrix_.value_ = {1, 0, 0, 1};
20132009
REQUIRE(highs.passModel(lp) == HighsStatus::kOk);
2014-
2015-
highs.resetGlobalScheduler(true);
20162010
}
20172011

20182012
void testAvgasGetRow(Highs& h) {
@@ -2295,8 +2289,6 @@ TEST_CASE("row-wise-get-row-avgas", "[highs_data]") {
22952289
h.ensureColwise();
22962290
testAvgasGetRow(h);
22972291
testAvgasGetCol(h);
2298-
2299-
h.resetGlobalScheduler(true);
23002292
}
23012293

23022294
TEST_CASE("hot-start-after-delete", "[highs_data]") {

check/TestLpValidation.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,8 +637,6 @@ TEST_CASE("LP-illegal-empty-start-ok", "[highs_data]") {
637637
lp.a_matrix_.start_ = {1};
638638
REQUIRE(highs.passModel(lp) == HighsStatus::kOk);
639639
REQUIRE(highs.getLp().a_matrix_.start_[0] == 0);
640-
641-
highs.resetGlobalScheduler(true);
642640
}
643641

644642
TEST_CASE("LP-row-wise", "[highs_data]") {

0 commit comments

Comments
 (0)