wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-17 11:32:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

use dtype=np.float64 in calls to np.mean

Browse Source
This commit is contained in:
Gregory R. Lee
2016-01-28 22:10:02 -05:00
parent 8483a62e76
commit b8e7740159
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/measure/simple_metrics.py
+8 -7
View File
@@ -16,11 +16,12 @@ def _assert_compatible(im1, im2):
def _as_floats(im1, im2):
"""Promote im1, im2 to floating point precision."""
if im1.dtype != np.float64:
im1 = im1.astype(np.float64)
if im2.dtype != np.float64:
im2 = im2.astype(np.float64)
"""Promote im1, im2 to nearest appropriate floating point precision."""
float_type = np.result_type(im1.dtype, im2.dtype, np.float32)
if im1.dtype != float_type:
im1 = im1.astype(float_type)
if im2.dtype != float_type:
im2 = im2.astype(float_type)
return im1, im2
@@ -40,7 +41,7 @@ def mean_squared_error(im1, im2):
"""
_assert_compatible(im1, im2)
im1, im2 = _as_floats(im1, im2)
return np.mean(np.square(im1 - im2))
return np.mean(np.square(im1 - im2), dtype=np.float64)
def normalized_root_mse(im_true, im_test, norm_type='Euclidean'):
@@ -77,7 +78,7 @@ def normalized_root_mse(im_true, im_test, norm_type='Euclidean'):
norm_type = norm_type.lower()
if norm_type == 'euclidean':
denom = np.sqrt(np.mean((im_true*im_true)))
denom = np.sqrt(np.mean((im_true*im_true), dtype=np.float64))
elif norm_type == 'min-max':
denom = im_true.max() - im_true.min()
elif norm_type == 'mean':