Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 8 additions & 9 deletions lib/iris/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ def assertDataAlmostEqual(self, data, reference_filename, **kwargs):
stats = json.load(reference_file)
self.assertEqual(stats.get('shape', []), list(data.shape))
self.assertEqual(stats.get('masked', False),
isinstance(data, ma.MaskedArray))
np.ma.is_masked(data))
Copy link
Member

Choose a reason for hiding this comment

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

@djkirkham We have a soft coding standard where we use ma instead of np.ma, see here.

If it's not too much trouble, could you adopt this please, thanks.

nstats = np.array((stats.get('mean', 0.), stats.get('std', 0.),
stats.get('max', 0.), stats.get('min', 0.)),
dtype=np.float_)
Expand All @@ -435,14 +435,13 @@ def assertDataAlmostEqual(self, data, reference_filename, **kwargs):
else:
self._ensure_folder(reference_path)
logger.warning('Creating result file: %s', reference_path)
masked = False
if isinstance(data, ma.MaskedArray):
masked = True
stats = {'mean': np.float_(data.mean()),
'std': np.float_(data.std()),
'max': np.float_(data.max()),
'min': np.float_(data.min()),
'shape': data.shape, 'masked': masked}
stats = collections.OrderedDict([
('std', np.float_(data.std())),
('min', np.float_(data.min())),
('max', np.float_(data.max())),
('shape', data.shape),
('masked', np.ma.is_masked(data)),
Copy link
Member

Choose a reason for hiding this comment

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

@djkirkham Here is well ... np.ma.is_masked(data) -> ma.is_masked(data)

('mean', np.float_(data.mean()))])
with open(reference_path, 'w') as reference_file:
reference_file.write(json.dumps(stats))

Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/max_latitude.data.0.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 331.70321238027685, "min": 101864.0, "max": 102977.0, "shape": [10, 720], "masked": true, "mean": 102466.40277777778}
{"std": 331.70321238027685, "min": 101864.0, "max": 102977.0, "shape": [10, 720], "masked": false, "mean": 102466.40277777778}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.0, "min": 102977.0, "max": 102977.0, "shape": [10], "masked": true, "mean": 102977.0}
{"std": 0.0, "min": 102977.0, "max": 102977.0, "shape": [10], "masked": false, "mean": 102977.0}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.0, "min": 102977.0, "max": 102977.0, "shape": [10], "masked": true, "mean": 102977.0}
{"std": 0.0, "min": 102977.0, "max": 102977.0, "shape": [10], "masked": false, "mean": 102977.0}
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/mean_latitude.data.0.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 305.67198815976997, "min": 100885.3425925926, "max": 101990.07175925926, "shape": [10, 720], "masked": true, "mean": 101445.07356931583}
{"std": 305.67198815976997, "min": 100885.3425925926, "max": 101990.07175925926, "shape": [10, 720], "masked": false, "mean": 101445.07356931583}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.0, "min": 101445.07356931586, "max": 101445.07356931586, "shape": [10], "masked": true, "mean": 101445.07356931586}
{"std": 0.0, "min": 101445.07356931586, "max": 101445.07356931586, "shape": [10], "masked": false, "mean": 101445.07356931586}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.0, "min": 101445.07356931585, "max": 101445.07356931585, "shape": [10], "masked": true, "mean": 101445.07356931585}
{"std": 0.0, "min": 101445.07356931585, "max": 101445.07356931585, "shape": [10], "masked": false, "mean": 101445.07356931585}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 247.17003116388435, "min": 101023.5, "max": 102126.0, "shape": [10, 720], "masked": true, "mean": 101629.08333333333}
{"std": 247.17003116388435, "min": 101023.5, "max": 102126.0, "shape": [10, 720], "masked": false, "mean": 101629.08333333333}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.0, "min": 101658.25, "max": 101658.25, "shape": [10], "masked": true, "mean": 101658.25}
{"std": 0.0, "min": 101658.25, "max": 101658.25, "shape": [10], "masked": false, "mean": 101658.25}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.0, "min": 101604.0, "max": 101604.0, "shape": [10], "masked": true, "mean": 101604.0}
{"std": 0.0, "min": 101604.0, "max": 101604.0, "shape": [10], "masked": false, "mean": 101604.0}
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/min_latitude.data.0.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 812.32687602393321, "min": 98385.0, "max": 101362.0, "shape": [10, 720], "masked": true, "mean": 99766.430555555562}
{"std": 812.32687602393321, "min": 98385.0, "max": 101362.0, "shape": [10, 720], "masked": false, "mean": 99766.430555555562}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.0, "min": 98385.0, "max": 98385.0, "shape": [10], "masked": true, "mean": 98385.0}
{"std": 0.0, "min": 98385.0, "max": 98385.0, "shape": [10], "masked": false, "mean": 98385.0}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.0, "min": 98385.0, "max": 98385.0, "shape": [10], "masked": true, "mean": 98385.0}
{"std": 0.0, "min": 98385.0, "max": 98385.0, "shape": [10], "masked": false, "mean": 98385.0}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 2.588099748331198, "min": 254.64399719238281, "max": 261.7274169921875, "shape": [4, 4], "masked": true, "mean": 258.11480712890625}
{"std": 2.588099748331198, "min": 254.64399719238281, "max": 261.7274169921875, "shape": [4, 4], "masked": false, "mean": 258.11480712890625}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.0, "min": 254.64399719238281, "max": 254.64399719238281, "shape": [4, 4], "masked": true, "mean": 254.64399719238281}
{"std": 0.0, "min": 254.64399719238281, "max": 254.64399719238281, "shape": [4, 4], "masked": false, "mean": 254.64399719238281}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.61282587616379602, "min": 3.0, "max": 4.5, "shape": [3], "masked": true, "mean": 3.7666667302449546}
{"std": 0.61282587616379602, "min": 3.0, "max": 4.5, "shape": [3], "masked": false, "mean": 3.7666667302449546}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20155135161352, "min": 286.57607421875002, "max": 1326.6421875000001, "shape": [6, 70], "masked": true, "mean": 368.57896210007442}
{"std": 183.20155135161352, "min": 286.57607421875002, "max": 1326.6421875000001, "shape": [6, 70], "masked": false, "mean": 368.57896210007442}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20154787243786, "min": 286.5760498046875, "max": 1326.642333984375, "shape": [6, 70], "masked": true, "mean": 368.57894345238094}
{"std": 183.20154787243786, "min": 286.5760498046875, "max": 1326.642333984375, "shape": [6, 70], "masked": false, "mean": 368.57894345238094}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.070972059805802012, "min": 368.37784598214284, "max": 368.75493861607146, "shape": [6, 100], "masked": true, "mean": 368.57896214657734}
{"std": 0.070972059805802012, "min": 368.37784598214284, "max": 368.75493861607146, "shape": [6, 100], "masked": false, "mean": 368.57896214657734}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.070973517507074896, "min": 368.3778076171875, "max": 368.7548828125, "shape": [6, 100], "masked": true, "mean": 368.57895833333333}
{"std": 0.070973517507074896, "min": 368.3778076171875, "max": 368.7548828125, "shape": [6, 100], "masked": false, "mean": 368.57895833333333}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20140423648354, "min": 286.94415283203125, "max": 1326.8153483072917, "shape": [70, 100], "masked": true, "mean": 368.5789633527483}
{"std": 183.20140423648354, "min": 286.94415283203125, "max": 1326.8153483072917, "shape": [70, 100], "masked": false, "mean": 368.5789633527483}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20140361283885, "min": 286.94415283203125, "max": 1326.8154296875, "shape": [70, 100], "masked": true, "mean": 368.57896428571428}
{"std": 183.20140361283885, "min": 286.94415283203125, "max": 1326.8154296875, "shape": [70, 100], "masked": false, "mean": 368.57896428571428}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20155278295425, "min": 286.5760546875, "max": 1326.6421875000001, "shape": [6, 70], "masked": true, "mean": 368.57896330915179}
{"std": 183.20155278295425, "min": 286.5760546875, "max": 1326.6421875000001, "shape": [6, 70], "masked": false, "mean": 368.57896330915179}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20154787243786, "min": 286.5760498046875, "max": 1326.642333984375, "shape": [6, 70], "masked": true, "mean": 368.57894345238094}
{"std": 183.20154787243786, "min": 286.5760498046875, "max": 1326.642333984375, "shape": [6, 70], "masked": false, "mean": 368.57894345238094}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.076507800752643393, "min": 368.36489955357143, "max": 368.74302455357144, "shape": [6, 100], "masked": true, "mean": 368.57896340215774}
{"std": 0.076507800752643393, "min": 368.36489955357143, "max": 368.74302455357144, "shape": [6, 100], "masked": false, "mean": 368.57896340215774}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.076507733018594218, "min": 368.36489868164062, "max": 368.7430419921875, "shape": [6, 100], "masked": true, "mean": 368.57895833333333}
{"std": 0.076507733018594218, "min": 368.36489868164062, "max": 368.7430419921875, "shape": [6, 100], "masked": false, "mean": 368.57895833333333}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20142290782221, "min": 287.06424967447919, "max": 1327.0152180989583, "shape": [70, 100], "masked": true, "mean": 368.57896332077746}
{"std": 183.20142290782221, "min": 287.06424967447919, "max": 1327.0152180989583, "shape": [70, 100], "masked": false, "mean": 368.57896332077746}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20142856585872, "min": 287.06423950195312, "max": 1327.0152587890625, "shape": [70, 100], "masked": true, "mean": 368.57896428571428}
{"std": 183.20142856585872, "min": 287.06423950195312, "max": 1327.0152587890625, "shape": [70, 100], "masked": false, "mean": 368.57896428571428}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.070973870961262162, "min": 368.3778125, "max": 368.7548828125, "shape": [6, 100], "masked": true, "mean": 368.57896432291665}
{"std": 0.070973870961262162, "min": 368.3778125, "max": 368.7548828125, "shape": [6, 100], "masked": false, "mean": 368.57896432291665}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.070973517507074896, "min": 368.3778076171875, "max": 368.7548828125, "shape": [6, 100], "masked": true, "mean": 368.57895833333333}
{"std": 0.070973517507074896, "min": 368.3778076171875, "max": 368.7548828125, "shape": [6, 100], "masked": false, "mean": 368.57895833333333}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.076508496136123455, "min": 368.36492187499999, "max": 368.743046875, "shape": [6, 100], "masked": true, "mean": 368.57896223958329}
{"std": 0.076508496136123455, "min": 368.36492187499999, "max": 368.743046875, "shape": [6, 100], "masked": false, "mean": 368.57896223958329}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.076507733018594218, "min": 368.36489868164062, "max": 368.7430419921875, "shape": [6, 100], "masked": true, "mean": 368.57895833333333}
{"std": 0.076507733018594218, "min": 368.36489868164062, "max": 368.7430419921875, "shape": [6, 100], "masked": false, "mean": 368.57895833333333}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.1376022048268124, "min": 368.2593994140625, "max": 369.01175944010419, "shape": [100, 100], "masked": true, "mean": 368.57896353352874}
{"std": 0.1376022048268124, "min": 368.2593994140625, "max": 369.01175944010419, "shape": [100, 100], "masked": false, "mean": 368.57896353352874}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.13760229016549494, "min": 368.2593994140625, "max": 369.01174926757812, "shape": [100, 100], "masked": true, "mean": 368.57897500000001}
{"std": 0.13760229016549494, "min": 368.2593994140625, "max": 369.01174926757812, "shape": [100, 100], "masked": false, "mean": 368.57897500000001}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20140556610502, "min": 286.94416015625001, "max": 1326.81546875, "shape": [70, 100], "masked": true, "mean": 368.57896378906258}
{"std": 183.20140556610502, "min": 286.94416015625001, "max": 1326.81546875, "shape": [70, 100], "masked": false, "mean": 368.57896378906258}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20140361283885, "min": 286.94415283203125, "max": 1326.8154296875, "shape": [70, 100], "masked": true, "mean": 368.57896428571428}
{"std": 183.20140361283885, "min": 286.94415283203125, "max": 1326.8154296875, "shape": [70, 100], "masked": false, "mean": 368.57896428571428}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20142267719854, "min": 287.06423828125003, "max": 1327.0153124999999, "shape": [70, 100], "masked": true, "mean": 368.57896318080356}
{"std": 183.20142267719854, "min": 287.06423828125003, "max": 1327.0153124999999, "shape": [70, 100], "masked": false, "mean": 368.57896318080356}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 183.20142856585872, "min": 287.06423950195312, "max": 1327.0152587890625, "shape": [70, 100], "masked": true, "mean": 368.57896428571428}
{"std": 183.20142856585872, "min": 287.06423950195312, "max": 1327.0152587890625, "shape": [70, 100], "masked": false, "mean": 368.57896428571428}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.13760184846046464, "min": 368.25937499999998, "max": 369.01171875, "shape": [100, 100], "masked": true, "mean": 368.5789632645089}
{"std": 0.13760184846046464, "min": 368.25937499999998, "max": 369.01171875, "shape": [100, 100], "masked": false, "mean": 368.5789632645089}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.13760229016549494, "min": 368.2593994140625, "max": 369.01174926757812, "shape": [100, 100], "masked": true, "mean": 368.57897500000001}
{"std": 0.13760229016549494, "min": 368.2593994140625, "max": 369.01174926757812, "shape": [100, 100], "masked": false, "mean": 368.57897500000001}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.048989868829430488, "min": 368.46124267578125, "max": 368.68606567382812, "shape": [100], "masked": true, "mean": 368.57249999999999}
{"std": 0.048989868829430488, "min": 368.46124267578125, "max": 368.68606567382812, "shape": [100], "masked": false, "mean": 368.57249999999999}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"std": 0.059104604901192966, "min": 368.43679809570312, "max": 368.67816162109375, "shape": [100], "masked": true, "mean": 368.57890624999999}
{"std": 0.059104604901192966, "min": 368.43679809570312, "max": 368.67816162109375, "shape": [100], "masked": false, "mean": 368.57890624999999}