Skip to content

Commit a4f1588

Browse files
committed
PEP8 fixes on sankey.py
1 parent 6fa35aa commit a4f1588

File tree

1 file changed

+30
-26
lines changed

1 file changed

+30
-26
lines changed

lib/matplotlib/sankey.py

+30-26
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
__credits__ = ["Yannick Copin"]
77
__license__ = "BSD"
88
__version__ = "2011/09/16"
9+
910
# Original version by Yannick Copin (ycopin@ipnl.in2p3.fr) 10/2/2010, available
1011
# at:
1112
# http://matplotlib.org/examples/api/sankey_demo_old.html
@@ -113,7 +114,7 @@ def _arc(self, quadrant=0, cw=True, radius=1, center=(0, 0)):
113114
ARC_VERTICES[:, 1]))
114115
if quadrant > 1:
115116
radius = -radius # Rotate 180 deg.
116-
return zip(ARC_CODES, radius*vertices +
117+
return zip(ARC_CODES, radius * vertices +
117118
np.tile(center, (ARC_VERTICES.shape[0], 1)))
118119

119120
def _add_input(self, path, angle, flow, length):
@@ -131,7 +132,7 @@ def _add_input(self, path, angle, flow, length):
131132
path.extend([(Path.LINETO, [x, y]),
132133
(Path.LINETO, dip),
133134
(Path.LINETO, [x, y + flow]),
134-
(Path.LINETO, [x+self.gap, y + flow])])
135+
(Path.LINETO, [x + self.gap, y + flow])])
135136
label_location = [dip[0] - self.offset, dip[1]]
136137
else: # Vertical
137138
x -= self.gap
@@ -149,7 +150,7 @@ def _add_input(self, path, angle, flow, length):
149150
# Inner arc isn't needed if inner radius is zero
150151
if self.radius:
151152
path.extend(self._arc(quadrant=quadrant,
152-
cw=angle==UP,
153+
cw=angle == UP,
153154
radius=self.radius,
154155
center=(x + self.radius,
155156
y - sign * self.radius)))
@@ -159,7 +160,7 @@ def _add_input(self, path, angle, flow, length):
159160
(Path.LINETO, dip),
160161
(Path.LINETO, [x - flow, y - sign * length])])
161162
path.extend(self._arc(quadrant=quadrant,
162-
cw=angle==DOWN,
163+
cw=angle == DOWN,
163164
radius=flow + self.radius,
164165
center=(x + self.radius,
165166
y - sign * self.radius)))
@@ -187,7 +188,7 @@ def _add_output(self, path, angle, flow, length):
187188
(Path.LINETO, tip),
188189
(Path.LINETO, [x, y - self.shoulder + flow]),
189190
(Path.LINETO, [x, y + flow]),
190-
(Path.LINETO, [x-self.gap, y + flow])])
191+
(Path.LINETO, [x - self.gap, y + flow])])
191192
label_location = [tip[0] + self.offset, tip[1]]
192193
else: # Vertical
193194
x += self.gap
@@ -204,10 +205,10 @@ def _add_output(self, path, angle, flow, length):
204205
# Inner arc isn't needed if inner radius is zero
205206
if self.radius:
206207
path.extend(self._arc(quadrant=quadrant,
207-
cw=angle==UP,
208+
cw=angle == UP,
208209
radius=self.radius,
209210
center=(x - self.radius,
210-
y + sign*self.radius)))
211+
y + sign * self.radius)))
211212
else:
212213
path.append((Path.LINETO, [x, y]))
213214
path.extend([(Path.LINETO, [x, y + sign * length]),
@@ -218,7 +219,7 @@ def _add_output(self, path, angle, flow, length):
218219
y + sign * length]),
219220
(Path.LINETO, [x - flow, y + sign * length])])
220221
path.extend(self._arc(quadrant=quadrant,
221-
cw=angle==DOWN,
222+
cw=angle == DOWN,
222223
radius=self.radius - flow,
223224
center=(x - self.radius,
224225
y + sign * self.radius)))
@@ -333,7 +334,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
333334
else:
334335
flows = np.array(flows)
335336
n = flows.shape[0] # Number of flows
336-
if rotation == None:
337+
if rotation is None:
337338
rotation = 0
338339
else:
339340
# In the code below, angles are expressed in deg/90
@@ -352,15 +353,15 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
352353
"same length.\nlabels has length %d, but flows has length %d."
353354
% (len(labels), n))
354355
else:
355-
labels = [labels]*n
356+
labels = [labels] * n
356357
assert trunklength >= 0, (
357358
"trunklength is negative.\nThis isn't allowed, because it would "
358359
"cause poor layout.")
359360
if np.absolute(np.sum(flows)) > self.tolerance:
360361
verbose.report(
361362
"The sum of the flows is nonzero (%f).\nIs the "
362363
"system not at steady state?" % np.sum(flows), 'helpful')
363-
scaled_flows = self.scale*flows
364+
scaled_flows = self.scale * flows
364365
gain = sum(max(flow, 0) for flow in scaled_flows)
365366
loss = sum(min(flow, 0) for flow in scaled_flows)
366367
if not (0.5 <= gain <= 2.0):
@@ -400,7 +401,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
400401
"within the tolerance (%f)." % (flow_error, self.tolerance))
401402

402403
# Determine if the flows are inputs.
403-
are_inputs = [None]*n
404+
are_inputs = [None] * n
404405
for i, flow in enumerate(flows):
405406
if flow >= self.tolerance:
406407
are_inputs[i] = True
@@ -414,12 +415,12 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
414415
% (i, flow, self.tolerance), 'helpful')
415416

416417
# Determine the angles of the arrows (before rotation).
417-
angles = [None]*n
418+
angles = [None] * n
418419
for i, (orient, is_input) in enumerate(zip(orientations, are_inputs)):
419420
if orient == 1:
420421
if is_input:
421422
angles[i] = DOWN
422-
elif is_input == False:
423+
elif not is_input:
423424
# Be specific since is_input can be None.
424425
angles[i] = UP
425426
elif orient == 0:
@@ -431,7 +432,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
431432
"but it must be -1, 0, or 1." % (i, orient))
432433
if is_input:
433434
angles[i] = UP
434-
elif is_input == False:
435+
elif not is_input:
435436
angles[i] = DOWN
436437

437438
# Justify the lengths of the paths.
@@ -462,10 +463,10 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
462463
for i, (angle, is_input, flow) in enumerate(reversed(zip(
463464
angles, are_inputs, scaled_flows))):
464465
if angle == UP and is_input:
465-
pathlengths[n-i-1] = lllength
466+
pathlengths[n - i - 1] = lllength
466467
lllength += flow
467468
elif angle == DOWN and not is_input:
468-
pathlengths[n-i-1] = lrlength
469+
pathlengths[n - i - 1] = lrlength
469470
lrlength -= flow
470471
# Determine the lengths of the left-side arrows
471472
# from the bottom upwards.
@@ -475,7 +476,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
475476
if angle == RIGHT:
476477
if is_input:
477478
if has_left_input:
478-
pathlengths[n-i-1] = 0
479+
pathlengths[n - i - 1] = 0
479480
else:
480481
has_left_input = True
481482
# Determine the lengths of the right-side arrows
@@ -537,11 +538,13 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
537538
for i, (angle, is_input, spec) in enumerate(reversed(zip(
538539
angles, are_inputs, zip(scaled_flows, pathlengths)))):
539540
if angle == UP and is_input:
540-
tips[n-i-1, :], label_locations[n-i-1, :] = self._add_input(
541-
llpath, angle, *spec)
541+
tip, label_location = self._add_input(llpath, angle, *spec)
542+
tips[n - i - 1, :] = tip
543+
label_locations[n - i - 1, :] = label_location
542544
elif angle == DOWN and not is_input:
543-
tips[n-i-1, :], label_locations[n-i-1, :] = self._add_output(
544-
lrpath, angle, *spec)
545+
tip, label_location = self._add_output(lrpath, angle, *spec)
546+
tips[n - i - 1, :] = tip
547+
label_locations[n - i - 1, :] = label_location
545548
# Add the left-side inputs from the bottom upwards.
546549
has_left_input = False
547550
for i, (angle, is_input, spec) in enumerate(reversed(zip(
@@ -554,8 +557,9 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
554557
llpath.append((Path.LINETO, [ulpath[-1][1][0],
555558
llpath[-1][1][1]]))
556559
has_left_input = True
557-
tips[n-i-1, :], label_locations[n-i-1, :] = self._add_input(
558-
llpath, angle, *spec)
560+
tip, label_location = self._add_input(llpath, angle, *spec)
561+
tips[n - i - 1, :], = tip
562+
label_locations[n - i - 1, :] = label_location
559563
# Add the right-side outputs from the top downwards.
560564
has_right_output = False
561565
for i, (angle, is_input, spec) in enumerate(zip(
@@ -595,7 +599,7 @@ def _get_angle(a, r):
595599
if prior is None:
596600
if rotation != 0: # By default, none of this is needed.
597601
angles = [_get_angle(angle, rotation) for angle in angles]
598-
rotate = Affine2D().rotate_deg(rotation*90).transform_point
602+
rotate = Affine2D().rotate_deg(rotation * 90).transform_point
599603
tips = rotate(tips)
600604
label_locations = rotate(label_locations)
601605
vertices = rotate(vertices)
@@ -604,7 +608,7 @@ def _get_angle(a, r):
604608
rotation = (self.diagrams[prior].angles[connect[0]] -
605609
angles[connect[1]])
606610
angles = [_get_angle(angle, rotation) for angle in angles]
607-
rotate = Affine2D().rotate_deg(rotation*90).transform_point
611+
rotate = Affine2D().rotate_deg(rotation * 90).transform_point
608612
tips = rotate(tips)
609613
offset = self.diagrams[prior].tips[connect[0]] - tips[connect[1]]
610614
translate = Affine2D().translate(*offset).transform_point

0 commit comments

Comments
 (0)