Skip to content

Np error patch #3188

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
merged 4 commits into from
Jul 12, 2014
Merged

Np error patch #3188

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
8d2f28b
BUG : fixes broadcast errors with np 1.9
tacaswell Jul 5, 2014
b163b1e
BUG : fix the rest of the errors from np 1.9
tacaswell Jul 5, 2014
5484b9f
BUG: improved fix for np 1.9 errors
ianthomas23 Jul 9, 2014
2733217
Merge pull request #5 from ianthomas23/np_error_patch
tacaswell Jul 9, 2014
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
4 changes: 2 additions & 2 deletions lib/matplotlib/tri/triinterpolate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,9 +462,9 @@ def _interpolate_single_key(self, return_key, tri_index, x, y):
dzdx = self._ReferenceElement.get_function_derivatives(
alpha, J, ecc, dof)
if return_key == 'dzdx':
return dzdx[:, 0]
return dzdx[:, 0, 0]
else:
return dzdx[:, 1]
return dzdx[:, 1, 0]
else:
raise ValueError("Invalid return_key: " + return_key)

Expand Down
9 changes: 6 additions & 3 deletions lib/matplotlib/tri/trirefine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ def refine_triangulation(self, return_tri_index=False, subdiv=3):
found_index = - np.ones(refi_npts, dtype=np.int32)
tri_mask = self._triangulation.mask
if tri_mask is None:
found_index[refi_triangles] = np.repeat(ancestors, 3)
found_index[refi_triangles] = np.repeat(ancestors,
3).reshape(-1, 3)
else:
# There is a subtlety here: we want to avoid whenever possible
# that refined points container is a masked triangle (which
Expand All @@ -126,9 +127,11 @@ def refine_triangulation(self, return_tri_index=False, subdiv=3):
# then overwrite it with unmasked ancestor numbers.
ancestor_mask = tri_mask[ancestors]
found_index[refi_triangles[ancestor_mask, :]
] = np.repeat(ancestors[ancestor_mask], 3)
] = np.repeat(ancestors[ancestor_mask],
3).reshape(-1, 3)
found_index[refi_triangles[~ancestor_mask, :]
] = np.repeat(ancestors[~ancestor_mask], 3)
] = np.repeat(ancestors[~ancestor_mask],
3).reshape(-1, 3)
return refi_triangulation, found_index
else:
return refi_triangulation
Expand Down