Thanks to visit codestin.com
Credit goes to github.com

Skip to content

alternate fix for issue #997 #1477

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
ianthomas23 merged 6 commits into from
Dec 4, 2012
Merged

alternate fix for issue #997 #1477

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6065697
delaunay linear_interpolate_grid: enable grid of height/width 1
Nov 2, 2012
49215c2
delaunay: test for 1d and 0d grids (fails upstream) re: issue #997
Nov 10, 2012
764571b
Merge branch 'iss997_test' into iss997_altfix
Nov 10, 2012
9fb8c3c
test_delaunay: avoid numbers in 1d test, use np.allclose
AmitAronovitch Nov 13, 2012
7d3d2f4
Merge branch 'iss997_test'
AmitAronovitch Nov 13, 2012
964a854
_delaunay.cpp: support [x0:x1:1j] grids even if x1!=x0
AmitAronovitch Nov 13, 2012
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
Binary file added lib/matplotlib/tests/baseline_images/test_delaunay/delaunay-1d-interp.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.
27 changes: 25 additions & 2 deletions lib/matplotlib/tests/test_delaunay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def interpolator(self, func):
z = func(self.x, self.y)
return self.tri.nn_extrapolator(z, bbox=self.xrange+self.yrange)

def make_all_testfuncs(allfuncs=allfuncs):
def make_all_2d_testfuncs(allfuncs=allfuncs):
def make_test(func):
filenames = [
'%s-%s' % (func.func_name, x) for x in
Expand All @@ -186,4 +186,27 @@ def reference_test():
for func in allfuncs:
globals()['test_%s' % func.func_name] = make_test(func)

make_all_testfuncs()
make_all_2d_testfuncs()

# 1d and 0d grid tests

ref_interpolator = Triangulation([0,10,10,0],
Copy link
Copy Markdown
Member

@pelson pelson Nov 13, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than using the module level namespace, it might be worth considering constructing a class which has "test_" methods.

Copy link
Copy Markdown
Contributor Author

@AmitAronovitch AmitAronovitch Nov 13, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When adding tests to an existing module, I should try staying close to existing style.
make_all_testfuncs() was there (I just renamed it), and since it used module functions rather than class methods, so did I
( and that would have been my default choice anyways in this case).

[0,0,10,10]).linear_interpolator([1,10,5,2.0])

def equal_arrays(a1,a2, tolerance=1e-10):
Copy link
Copy Markdown
Member

@pelson pelson Nov 13, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were you aware of numpy.testing? In particular the numpy.testing.assert_array_almost_equal function.

Copy link
Copy Markdown
Contributor Author

@AmitAronovitch AmitAronovitch Nov 13, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, but always happy to learn.
help(assert_array_almost_equal) referred me to np.testing.assert_allclose, which in turn referenced np.allclose(). A useful np shortcut I was not aware of. Thanks 👍
(p.s. It seems that generalizations added by assert_allclose, like handling inf/nan values, are redundant in this case, and probably not worth the complication of extra import and runtime, so I use plain allclose() ).

return np.all(np.absolute(a1 - a2) < tolerance)

def test_1d_grid():
res = ref_interpolator[3:6:2j,1:1:1j]
assert equal_arrays(res, [[1.6],[1.9]])

def test_0d_grid():
res = ref_interpolator[3:3:1j,1:1:1j]
assert equal_arrays(res, [[1.6]])

@image_comparison(baseline_images=['delaunay-1d-interp'], extensions=['png'])
Copy link
Copy Markdown
Member

@pelson pelson Nov 13, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should probably remove the fonts from this plot. (see other examples in test_axes)

Copy link
Copy Markdown
Contributor Author

@AmitAronovitch AmitAronovitch Nov 13, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought the same myself, but wanted to get feedback, since these "freetype_version=" arguments seem to appear everywhere. Indeed, test_axes has a couple of tick-less plots. Point taken.

def test_1d_plots():
x_range = slice(0.25,9.75,20j)
x = np.mgrid[x_range]
for y in xrange(2,10,2):
plt.plot(x, ref_interpolator[x_range,y:y:1j])