Skip to content

Revert "test_pearsonr: use compatible cubes for testing compatible cubes" #3004

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

Closed
wants to merge 2 commits into from
Closed

Revert "test_pearsonr: use compatible cubes for testing compatible cubes" #3004

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60fc9d2
Revert "Use unittest.mock for Python 3 (#3003)"
pelson May 1, 2018
d452ea2
Revert "test_pearsonr: use compatible cubes for testing compatible cu…
pelson May 1, 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
39 changes: 20 additions & 19 deletions lib/iris/tests/unit/analysis/stats/test_pearsonr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2014 - 2018, Met Office
# (C) British Crown Copyright 2014 - 2017, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -39,7 +39,6 @@ def setUp(self):
('NetCDF', 'global', 'xyt', 'SMALL_total_column_co2.nc')))
self.cube_a = cube_temp[0:6]
self.cube_b = cube_temp[20:26]
self.cube_b.replace_coord(self.cube_a.coord('time').copy())
cube_temp = self.cube_a.copy()
cube_temp.coord('latitude').guess_bounds()
cube_temp.coord('longitude').guess_bounds()
Expand All @@ -60,14 +59,15 @@ def test_incompatible_cubes(self):
'longitude')

def test_compatible_cubes(self):
r = stats.pearsonr(self.cube_a, self.cube_b,
['latitude', 'longitude'])
self.assertArrayAlmostEqual(r.data, [0.81114936,
0.81690538,
0.79833135,
0.81118674,
0.79745386,
0.81278484])
with self.assertRaises(ValueError):
r = stats.pearsonr(self.cube_a, self.cube_b,
['latitude', 'longitude'])
self.assertArrayAlmostEqual(r.data, [0.81114936,
0.81690538,
0.79833135,
0.81118674,
0.79745386,
0.81278484])

def test_broadcast_cubes(self):
r1 = stats.pearsonr(self.cube_a, self.cube_b[0, :, :],
Expand All @@ -82,15 +82,16 @@ def test_broadcast_cubes(self):
self.assertArrayEqual(r2.data, np.array(r_by_slice))

def test_compatible_cubes_weighted(self):
r = stats.pearsonr(self.cube_a, self.cube_b,
['latitude', 'longitude'],
self.weights)
self.assertArrayAlmostEqual(r.data, [0.79106045,
0.79989169,
0.78826918,
0.79925855,
0.79011544,
0.80115837])
with self.assertRaises(ValueError):
r = stats.pearsonr(self.cube_a, self.cube_b,
['latitude', 'longitude'],
self.weights)
self.assertArrayAlmostEqual(r.data, [0.79106045,
0.79989169,
0.78826918,
0.79925855,
0.79011544,
0.80115837])

def test_broadcast_cubes_weighted(self):
r = stats.pearsonr(self.cube_a, self.cube_b[0, :, :],
Expand Down