Skip to content

Commit 26ee0ba

Browse files
committed
Merge branch 'latest' into strongcg
2 parents 2d7900a + 17fdb8b commit 26ee0ba

File tree

8 files changed

+622
-113
lines changed

8 files changed

+622
-113
lines changed

check/TestPresolve.cpp

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,3 +703,24 @@ TEST_CASE("lifting-for-probing", "[highs_test_presolve]") {
703703
highs.readModel(model_file);
704704
REQUIRE(highs.presolve() == HighsStatus::kOk);
705705
}
706+
707+
TEST_CASE("presolve-issue-2388", "[highs_test_presolve]") {
708+
std::string model_file =
709+
std::string(HIGHS_DIR) + "/check/instances/issue-2388.lp";
710+
Highs highs;
711+
highs.setOptionValue("output_flag", dev_run);
712+
highs.readModel(model_file);
713+
REQUIRE(highs.presolve() == HighsStatus::kOk);
714+
REQUIRE(highs.getModelPresolveStatus() ==
715+
HighsPresolveStatus::kReducedToEmpty);
716+
}
717+
718+
TEST_CASE("presolve-issue-2402", "[highs_test_presolve]") {
719+
std::string model_file =
720+
std::string(HIGHS_DIR) + "/check/instances/issue-2402.mps";
721+
Highs highs;
722+
highs.setOptionValue("output_flag", dev_run);
723+
highs.readModel(model_file);
724+
REQUIRE(highs.presolve() == HighsStatus::kOk);
725+
REQUIRE(highs.getModelPresolveStatus() == HighsPresolveStatus::kInfeasible);
726+
}

check/instances/issue-2388.lp

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
\ENCODING=ISO-8859-1
2+
\Problem name: QP from CasADi
3+
4+
Minimize
5+
obj: 0 x9 + 0 x10 + 0 x13 + 0 x14 + x47 + x48
6+
Subject To
7+
c1: x5 + x11 - x27 = 0
8+
c3: x17 + x23 - x37 = 0
9+
c4: - x15 + x21 + x35 = 0
10+
c7: x6 + x12 - x28 = 0
11+
c8: - x2 - x4 + x26 = 0
12+
c9: x18 + x24 - x38 = 0
13+
c10: - x16 + x22 + x36 = 0
14+
c13: - 0.01449347091216 x41 - 0.256120772302458 x43 >= 0
15+
c14: - 0.01449347091216 x42 - 0.256120772302458 x44 >= 0
16+
c15: - 0.01449347091216 x41 - 0.256120772302458 x43 <= 0
17+
c16: - 0.01449347091216 x42 - 0.256120772302458 x44 <= 0
18+
c17: - 0.1 x43 - 0.1 x49 - x53 >= -1
19+
c18: - 0.1 x44 - 0.1 x50 - x54 >= -1
20+
c19: 0.1 x43 - 0.1 x49 + x53 >= 0
21+
c20: 0.1 x44 - 0.1 x50 + x54 >= 0
22+
c21: - 0.1 x43 - 0.1 x49 + x53 <= 1
23+
c22: - 0.1 x44 - 0.1 x50 + x54 <= 1
24+
c23: 0.1 x43 - 0.1 x49 - x53 <= 0
25+
c24: 0.1 x44 - 0.1 x50 - x54 <= 0
26+
c25: - 0.255290703510786 x31 - 0.014446498627253 x41 >= 0
27+
c26: - 0.255290703510786 x32 - 0.014446498627253 x42 >= 0
28+
c27: - 0.255290703510786 x31 - 0.014446498627253 x41 <= 0
29+
c28: - 0.255290703510786 x32 - 0.014446498627253 x42 <= 0
30+
c35: 0.1 x31 - 0.1 x51 - x53 <= 0
31+
c36: 0.1 x32 - 0.1 x52 - x54 <= 0
32+
c37: x55 = 1
33+
c38: x56 = 1
34+
c41: - 0.234227413705435 x5 + 0.234227413705435 x37 + 4.26935508606863 x43
35+
= 0
36+
c42: - 0.234988995947158 x17 + 0.234988995947158 x27 + 4.2555184168065 x31
37+
= 0
38+
c43: x17 - x37 >= 10.2
39+
c62: x35 - 0.45 x41 = 0
40+
c63: x25 - 0.75 x41 = 0
41+
c72: 4.1496 x22 + 1.5 x48 >= 1.5
42+
c73: 4.1496 x22 - 0.5 x48 <= 1.5
43+
Bounds
44+
0.18074031231926 <= x2 <= 0.301233853865433
45+
0 <= x4 <= 1.20493541546173
46+
x5 Free
47+
x6 Free
48+
0 <= x15 <= 1.20493541546173
49+
0 <= x16 <= 1.20493541546173
50+
x17 Free
51+
x18 Free
52+
-Inf <= x23 <= 0
53+
-Inf <= x24 <= 0
54+
0 <= x25 <= 0.481974166184692
55+
0 <= x26 <= 0.481974166184692
56+
x27 Free
57+
x28 Free
58+
x31 Free
59+
x32 Free
60+
0 <= x35 <= 1.20493541546173
61+
0 <= x36 <= 1.20493541546173
62+
x37 Free
63+
x38 Free
64+
x41 Free
65+
x42 Free
66+
x43 Free
67+
x44 Free
68+
0 <= x47 <= 1
69+
0 <= x48 <= 1
70+
x53 = 1
71+
x54 = 1
72+
0 <= x55 <= 2
73+
0 <= x56 <= 2
74+
Generals
75+
x53 x54
76+
End

0 commit comments

Comments
 (0)