From 17c7d10918c742496c53d35a9c022a260091c057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <hannesschoenberger@gmail.com>
Date: Fri, 5 Oct 2012 10:05:06 +0200
Subject: [PATCH] Rename scale function to rescale and scale variables

---
 skimage/transform/__init__.py         |  2 +-
 skimage/transform/_warps.py           | 18 +++++++++---------
 skimage/transform/tests/test_warps.py |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/skimage/transform/__init__.py b/skimage/transform/__init__.py
index 3185bf1d..befcc23f 100644
--- a/skimage/transform/__init__.py
+++ b/skimage/transform/__init__.py
@@ -6,6 +6,6 @@ from ._geometric import (warp, warp_coords, estimate_transform,
                          SimilarityTransform, AffineTransform,
                          ProjectiveTransform, PolynomialTransform,
                          PiecewiseAffineTransform)
-from ._warps import swirl, homography, resize, rotate, scale
+from ._warps import swirl, homography, resize, rotate, rescale
 from .pyramids import (pyramid_reduce, pyramid_expand,
                        pyramid_gaussian, pyramid_laplacian)
diff --git a/skimage/transform/_warps.py b/skimage/transform/_warps.py
index 2c508763..c64998fc 100644
--- a/skimage/transform/_warps.py
+++ b/skimage/transform/_warps.py
@@ -35,15 +35,15 @@ def resize(image, output_shape, order=1, mode='constant', cval=0.):
     rows, cols = output_shape
     orig_rows, orig_cols = image.shape[0], image.shape[1]
 
-    rscale = float(orig_rows) / rows
-    cscale = float(orig_cols) / cols
+    row_scale = float(orig_rows) / rows
+    col_scale = float(orig_cols) / cols
 
     # 3 control points necessary to estimate exact AffineTransform
     src_corners = np.array([[1, 1], [1, rows], [cols, rows]]) - 1
     dst_corners = np.zeros(src_corners.shape, dtype=np.double)
     # take into account that 0th pixel is at position (0.5, 0.5)
-    dst_corners[:, 0] = cscale * (src_corners[:, 0] + 0.5) - 0.5
-    dst_corners[:, 1] = rscale * (src_corners[:, 1] + 0.5) - 0.5
+    dst_corners[:, 0] = col_scale * (src_corners[:, 0] + 0.5) - 0.5
+    dst_corners[:, 1] = row_scale * (src_corners[:, 1] + 0.5) - 0.5
 
     tform = AffineTransform()
     tform.estimate(src_corners, dst_corners)
@@ -52,7 +52,7 @@ def resize(image, output_shape, order=1, mode='constant', cval=0.):
                 mode=mode, cval=cval)
 
 
-def scale(image, scale, order=1, mode='constant', cval=0.):
+def rescale(image, scale, order=1, mode='constant', cval=0.):
     """Scale image.
 
     Parameters
@@ -83,13 +83,13 @@ def scale(image, scale, order=1, mode='constant', cval=0.):
     """
 
     try:
-        rscale, cscale = scale
+        row_scale, col_scale = scale
     except TypeError:
-        rscale = cscale = scale
+        row_scale = col_scale = scale
 
     orig_rows, orig_cols = image.shape[0], image.shape[1]
-    rows = np.round(rscale * orig_rows)
-    cols = np.round(cscale * orig_cols)
+    rows = np.round(row_scale * orig_rows)
+    cols = np.round(col_scale * orig_cols)
     output_shape = (rows, cols)
 
     return resize(image, output_shape, order=order, mode=mode, cval=cval)
diff --git a/skimage/transform/tests/test_warps.py b/skimage/transform/tests/test_warps.py
index 51a62e55..69980b25 100644
--- a/skimage/transform/tests/test_warps.py
+++ b/skimage/transform/tests/test_warps.py
@@ -2,7 +2,7 @@ from numpy.testing import assert_array_almost_equal, run_module_suite
 import numpy as np
 from scipy.ndimage import map_coordinates
 
-from skimage.transform import (warp, warp_coords, rotate, resize, scale,
+from skimage.transform import (warp, warp_coords, rotate, resize, rescale,
                                AffineTransform,
                                ProjectiveTransform,
                                SimilarityTransform, homography)
@@ -98,7 +98,7 @@ def test_scale():
     # same scale factor
     x = np.zeros((5, 5), dtype=np.double)
     x[1, 1] = 1
-    scaled = scale(x, 2, order=0)
+    scaled = rescale(x, 2, order=0)
     ref = np.zeros((10, 10))
     ref[2:4, 2:4] = 1
     assert_array_almost_equal(scaled, ref)
@@ -106,7 +106,7 @@ def test_scale():
     # different scale factors
     x = np.zeros((5, 5), dtype=np.double)
     x[1, 1] = 1
-    scaled = scale(x, (2, 1), order=0)
+    scaled = rescale(x, (2, 1), order=0)
     ref = np.zeros((10, 5))
     ref[2:4, 1] = 1
     assert_array_almost_equal(scaled, ref)