Skip to content

Filter out inf values in plot_surface #26253

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
tacaswell merged 4 commits into from
Aug 3, 2023
Merged

Filter out inf values in plot_surface #26253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
879793e
Filter out inf values in plot_surface
LemonBoy Jul 4, 2023
7e820b7
Add test for surface plot with inf values
LemonBoy Jul 4, 2023
4ea6820
Fix flake8 errors
LemonBoy Jul 4, 2023
ba7af99
Restore np.array call
LemonBoy Jul 31, 2023
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
10 changes: 5 additions & 5 deletions lib/mpl_toolkits/mplot3d/axes3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1702,18 +1702,18 @@ def plot_surface(self, X, Y, Z, *, norm=None, vmin=None,
if fcolors is not None:
colset.append(fcolors[rs][cs])

# In cases where there are NaNs in the data (possibly from masked
# arrays), artifacts can be introduced. Here check whether NaNs exist
# and remove the entries if so
if not isinstance(polys, np.ndarray) or np.isnan(polys).any():
# In cases where there are non-finite values in the data (possibly NaNs from
# masked arrays), artifacts can be introduced. Here check whether such values
# are present and remove them.
if not isinstance(polys, np.ndarray) or not np.isfinite(polys).all():
new_polys = []
new_colset = []

# Depending on fcolors, colset is either an empty list or has as
# many elements as polys. In the former case new_colset results in
# a list with None entries, that is discarded later.
for p, col in itertools.zip_longest(polys, colset):
new_poly = np.array(p)[~np.isnan(p).any(axis=1)]
new_poly = np.array(p)[np.isfinite(p).all(axis=1)]
if len(new_poly):
new_polys.append(new_poly)
new_colset.append(col)
Expand Down
Binary file added lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/surface3d_zsort_inf.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2232,3 +2232,16 @@ def test_scatter_masked_color():
# Assert sizes' equality
assert len(path3d.get_offsets()) ==\
len(super(type(path3d), path3d).get_facecolors())


@mpl3d_image_comparison(['surface3d_zsort_inf.png'], style='mpl20')
def test_surface3d_zsort_inf():
fig = plt.figure()
ax = fig.add_subplot(projection='3d')

x, y = np.mgrid[-2:2:0.1, -2:2:0.1]
z = np.sin(x)**2 + np.cos(y)**2
z[x.shape[0] // 2:, x.shape[1] // 2:] = np.inf

ax.plot_surface(x, y, z, cmap='jet')
ax.view_init(elev=45, azim=145)