Skip to content

Commit e1509c2

Browse files
jsiirolajsiirola
committed
NFC: apply black
1 parent 7eec611 commit e1509c2

File tree

2 files changed

+17
-80
lines changed

2 files changed

+17
-80
lines changed

‎pyomo/core/expr/compare.py

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ def handle_sequence(node: collections.abc.Sequence, pn: List):
7070
pn.append((collections.abc.Sequence, len(node)))
7171
return list(node)
7272

73+
7374
def handle_inequality(node: collections.abc.Sequence, pn: List):
7475
pn.append((type(node), node.nargs(), node.strict))
7576
return node.args

‎pyomo/core/tests/unit/test_relational_expr_dispatcher.py

+16-80
Original file line numberDiff line numberDiff line change
@@ -4810,23 +4810,15 @@ def test_lt_asbinary(self):
48104810
(self.asbinary, self.one, InequalityExpression((self.bin, 1), True)),
48114811
# 4:
48124812
(self.asbinary, self.native, InequalityExpression((self.bin, 5), True)),
4813-
(
4814-
self.asbinary,
4815-
self.npv,
4816-
InequalityExpression((self.bin, self.npv), True),
4817-
),
4813+
(self.asbinary, self.npv, InequalityExpression((self.bin, self.npv), True)),
48184814
(self.asbinary, self.param, InequalityExpression((self.bin, 6), True)),
48194815
(
48204816
self.asbinary,
48214817
self.param_mut,
48224818
InequalityExpression((self.bin, self.param_mut), True),
48234819
),
48244820
# 8:
4825-
(
4826-
self.asbinary,
4827-
self.var,
4828-
InequalityExpression((self.bin, self.var), True),
4829-
),
4821+
(self.asbinary, self.var, InequalityExpression((self.bin, self.var), True)),
48304822
(
48314823
self.asbinary,
48324824
self.mon_native,
@@ -4848,11 +4840,7 @@ def test_lt_asbinary(self):
48484840
self.linear,
48494841
InequalityExpression((self.bin, self.linear), True),
48504842
),
4851-
(
4852-
self.asbinary,
4853-
self.sum,
4854-
InequalityExpression((self.bin, self.sum), True),
4855-
),
4843+
(self.asbinary, self.sum, InequalityExpression((self.bin, self.sum), True)),
48564844
(
48574845
self.asbinary,
48584846
self.other,
@@ -4976,23 +4964,15 @@ def test_lt_one(self):
49764964
(self.one, self.native, True),
49774965
(self.one, self.npv, InequalityExpression((1, self.npv), True)),
49784966
(self.one, self.param, True),
4979-
(
4980-
self.one,
4981-
self.param_mut,
4982-
InequalityExpression((1, self.param_mut), True),
4983-
),
4967+
(self.one, self.param_mut, InequalityExpression((1, self.param_mut), True)),
49844968
# 8:
49854969
(self.one, self.var, InequalityExpression((1, self.var), True)),
49864970
(
49874971
self.one,
49884972
self.mon_native,
49894973
InequalityExpression((1, self.mon_native), True),
49904974
),
4991-
(
4992-
self.one,
4993-
self.mon_param,
4994-
InequalityExpression((1, self.mon_param), True),
4995-
),
4975+
(self.one, self.mon_param, InequalityExpression((1, self.mon_param), True)),
49964976
(self.one, self.mon_npv, InequalityExpression((1, self.mon_npv), True)),
49974977
# 12:
49984978
(self.one, self.linear, InequalityExpression((1, self.linear), True)),
@@ -5075,11 +5055,7 @@ def test_lt_native(self):
50755055
self.le,
50765056
RangedExpression((5,) + self.le.args, (True, False)),
50775057
),
5078-
(
5079-
self.native,
5080-
self.lt,
5081-
RangedExpression((5,) + self.lt.args, (True, True)),
5082-
),
5058+
(self.native, self.lt, RangedExpression((5,) + self.lt.args, (True, True))),
50835059
# 24
50845060
(
50855061
self.native,
@@ -5093,11 +5069,7 @@ def test_lt_native(self):
50935069
def test_lt_npv(self):
50945070
tests = [
50955071
(self.npv, self.invalid, NotImplemented),
5096-
(
5097-
self.npv,
5098-
self.asbinary,
5099-
InequalityExpression((self.npv, self.bin), True),
5100-
),
5072+
(self.npv, self.asbinary, InequalityExpression((self.npv, self.bin), True)),
51015073
(self.npv, self.zero, InequalityExpression((self.npv, 0), True)),
51025074
(self.npv, self.one, InequalityExpression((self.npv, 1), True)),
51035075
# 4:
@@ -5230,11 +5202,7 @@ def test_lt_param(self):
52305202
"Cannot create an InequalityExpression where one of the "
52315203
"sub-expressions is a relational expression",
52325204
),
5233-
(
5234-
self.param,
5235-
self.le,
5236-
RangedExpression((6,) + self.le.args, (True, False)),
5237-
),
5205+
(self.param, self.le, RangedExpression((6,) + self.le.args, (True, False))),
52385206
(self.param, self.lt, RangedExpression((6,) + self.lt.args, (True, True))),
52395207
# 24
52405208
(
@@ -5259,11 +5227,7 @@ def test_lt_param_mut(self):
52595227
self.zero,
52605228
InequalityExpression((self.param_mut, 0), True),
52615229
),
5262-
(
5263-
self.param_mut,
5264-
self.one,
5265-
InequalityExpression((self.param_mut, 1), True),
5266-
),
5230+
(self.param_mut, self.one, InequalityExpression((self.param_mut, 1), True)),
52675231
# 4:
52685232
(
52695233
self.param_mut,
@@ -5383,11 +5347,7 @@ def test_lt_param_mut(self):
53835347
def test_lt_var(self):
53845348
tests = [
53855349
(self.var, self.invalid, NotImplemented),
5386-
(
5387-
self.var,
5388-
self.asbinary,
5389-
InequalityExpression((self.var, self.bin), True),
5390-
),
5350+
(self.var, self.asbinary, InequalityExpression((self.var, self.bin), True)),
53915351
(self.var, self.zero, InequalityExpression((self.var, 0), True)),
53925352
(self.var, self.one, InequalityExpression((self.var, 1), True)),
53935353
# 4:
@@ -5621,11 +5581,7 @@ def test_lt_mon_param(self):
56215581
self.zero,
56225582
InequalityExpression((self.mon_param, 0), True),
56235583
),
5624-
(
5625-
self.mon_param,
5626-
self.one,
5627-
InequalityExpression((self.mon_param, 1), True),
5628-
),
5584+
(self.mon_param, self.one, InequalityExpression((self.mon_param, 1), True)),
56295585
# 4:
56305586
(
56315587
self.mon_param,
@@ -5965,11 +5921,7 @@ def test_lt_linear(self):
59655921
def test_lt_sum(self):
59665922
tests = [
59675923
(self.sum, self.invalid, NotImplemented),
5968-
(
5969-
self.sum,
5970-
self.asbinary,
5971-
InequalityExpression((self.sum, self.bin), True),
5972-
),
5924+
(self.sum, self.asbinary, InequalityExpression((self.sum, self.bin), True)),
59735925
(self.sum, self.zero, InequalityExpression((self.sum, 0), True)),
59745926
(self.sum, self.one, InequalityExpression((self.sum, 1), True)),
59755927
# 4:
@@ -6531,11 +6483,7 @@ def test_lt_param0(self):
65316483
self.le,
65326484
RangedExpression((0,) + self.le.args, (True, False)),
65336485
),
6534-
(
6535-
self.param0,
6536-
self.lt,
6537-
RangedExpression((0,) + self.lt.args, (True, True)),
6538-
),
6486+
(self.param0, self.lt, RangedExpression((0,) + self.lt.args, (True, True))),
65396487
# 24
65406488
(
65416489
self.param0,
@@ -6597,11 +6545,7 @@ def test_lt_param1(self):
65976545
self.le,
65986546
RangedExpression((1,) + self.le.args, (True, False)),
65996547
),
6600-
(
6601-
self.param1,
6602-
self.lt,
6603-
RangedExpression((1,) + self.lt.args, (True, True)),
6604-
),
6548+
(self.param1, self.lt, RangedExpression((1,) + self.lt.args, (True, True))),
66056549
# 24
66066550
(
66076551
self.param1,
@@ -6891,11 +6835,7 @@ def test_lt_le(self):
68916835
self.zero,
68926836
RangedExpression((self.le.args + (0,)), (False, True)),
68936837
),
6894-
(
6895-
self.le,
6896-
self.one,
6897-
RangedExpression((self.le.args + (1,)), (False, True)),
6898-
),
6838+
(self.le, self.one, RangedExpression((self.le.args + (1,)), (False, True))),
68996839
# 4:
69006840
(
69016841
self.le,
@@ -7022,11 +6962,7 @@ def test_lt_lt(self):
70226962
self.asbinary,
70236963
RangedExpression((self.lt.args + (self.bin,)), (True, True)),
70246964
),
7025-
(
7026-
self.lt,
7027-
self.zero,
7028-
RangedExpression((self.lt.args + (0,)), (True, True)),
7029-
),
6965+
(self.lt, self.zero, RangedExpression((self.lt.args + (0,)), (True, True))),
70306966
(self.lt, self.one, RangedExpression((self.lt.args + (1,)), (True, True))),
70316967
# 4:
70326968
(

0 commit comments

Comments
 (0)