Skip to content

MAINT: Vectorize bar3d #12137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QuLogic merged 5 commits into from
Sep 24, 2018
Merged

MAINT: Vectorize bar3d #12137

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94680be
MAINT: line-wrap bar3d points for clarity
eric-wieser Sep 16, 2018
7943100
MAINT: Vectorize the addition of the position in bar3d
eric-wieser Sep 17, 2018
351f460
MAINT: Vectorize the scaling of bar3d
eric-wieser Sep 17, 2018
7d09535
MAINT: Pre-compute the cuboid array
eric-wieser Sep 17, 2018
f44b437
MAINT: Vectorize the entire computation of the bar3d polygons
eric-wieser Sep 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 57 additions & 18 deletions lib/mpl_toolkits/mplot3d/axes3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2432,24 +2432,63 @@ def bar3d(self, x, y, z, dx, dy, dz, color=None,
minz = np.min(z)
maxz = np.max(z + dz)

polys = []
for xi, yi, zi, dxi, dyi, dzi in zip(x, y, z, dx, dy, dz):
polys.extend([
((xi, yi, zi), (xi + dxi, yi, zi),
(xi + dxi, yi + dyi, zi), (xi, yi + dyi, zi)),
((xi, yi, zi + dzi), (xi + dxi, yi, zi + dzi),
(xi + dxi, yi + dyi, zi + dzi), (xi, yi + dyi, zi + dzi)),

((xi, yi, zi), (xi + dxi, yi, zi),
(xi + dxi, yi, zi + dzi), (xi, yi, zi + dzi)),
((xi, yi + dyi, zi), (xi + dxi, yi + dyi, zi),
(xi + dxi, yi + dyi, zi + dzi), (xi, yi + dyi, zi + dzi)),

((xi, yi, zi), (xi, yi + dyi, zi),
(xi, yi + dyi, zi + dzi), (xi, yi, zi + dzi)),
((xi + dxi, yi, zi), (xi + dxi, yi + dyi, zi),
(xi + dxi, yi + dyi, zi + dzi), (xi + dxi, yi, zi + dzi)),
])
# shape (6, 4, 3)
cuboid = np.array([
# -z
(
(0, 0, 0),
(1, 0, 0),
(1, 1, 0),
(0, 1, 0)
),
# +z
(
(0, 0, 1),
(1, 0, 1),
(1, 1, 1),
(0, 1, 1)
),
# -y
(
(0, 0, 0),
(1, 0, 0),
(1, 0, 1),
(0, 0, 1)
),
# +y
(
(0, 1, 0),
(1, 1, 0),
(1, 1, 1),
(0, 1, 1)
),
# -x
(
(0, 0, 0),
(0, 1, 0),
(0, 1, 1),
(0, 0, 1)
),
# +x
(
(1, 0, 0),
(1, 1, 0),
(1, 1, 1),
(1, 0, 1)
),
])

# indexed by [bar, face, vertex, coord]
polys = np.empty(x.shape + cuboid.shape)

# handle each coordinate separately
for i, p, dp in [(0, x, dx), (1, y, dy), (2, z, dz)]:
p = p[..., np.newaxis, np.newaxis]
dp = dp[..., np.newaxis, np.newaxis]
polys[..., i] = p + dp * cuboid[..., i]

# collapse the first two axes
polys = polys.reshape((-1,) + polys.shape[2:])

facecolors = []
if color is None:
Expand Down