alternate fix for issue #997 #1477
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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_2d_testfuncs(allfuncs=allfuncs): | ||
| def make_test(func): | ||
| filenames = [ | ||
| '%s-%s' % (func.func_name, x) for x in | ||
|
|
@@ -186,4 +186,27 @@ def reference_test(): | |
| for func in allfuncs: | ||
| globals()['test_%s' % func.func_name] = make_test(func) | ||
|
|
||
| make_all_2d_testfuncs() | ||
|
|
||
| # 1d and 0d grid tests | ||
|
|
||
| ref_interpolator = Triangulation([0,10,10,0], | ||
| [0,0,10,10]).linear_interpolator([1,10,5,2.0]) | ||
|
|
||
| def equal_arrays(a1,a2, tolerance=1e-10): | ||
|
There was a problem hiding this comment. Were you aware of numpy.testing? In particular the There was a problem hiding this comment. Nope, but always happy to learn. |
||
| 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']) | ||
|
There was a problem hiding this comment. I think we should probably remove the fonts from this plot. (see other examples in There was a problem hiding this comment. 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]) |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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).