More removals of dead code.

Author: tcld

tests/common_test.py

@@ -1,7 +1,6 @@
 import unittest
 import numpy
-from worldengine.common import Counter, anti_alias, get_verbose, \
-    rescale_value, set_verbose
+from worldengine.common import Counter, anti_alias, get_verbose, set_verbose
 
 
 class TestCommon(unittest.TestCase):
@@ -27,25 +26,6 @@ def test_counter(self):
         c.count("a")
         self.assertEqual("a : 1\nb : 3\n", c.to_str())
 
-    def test_rescale_value(self):
-        self.assertAlmostEqual(0.0, rescale_value(0.0,  0.0, 1.0, 0.0, 10.0))
-        self.assertAlmostEqual(2.5, rescale_value(0.25, 0.0, 1.0, 0.0, 10.0))
-        self.assertAlmostEqual(5.0, rescale_value(0.5,  0.0, 1.0, 0.0, 10.0))
-        self.assertAlmostEqual(7.5, rescale_value(0.75, 0.0, 1.0, 0.0, 10.0))
-        self.assertAlmostEqual(10.0, rescale_value(1.0,  0.0, 1.0, 0.0, 10.0))
-
-        self.assertAlmostEqual(5.0, rescale_value(0.0,  0.0, 1.0, 5.0, 10.0))
-        self.assertAlmostEqual(6.25, rescale_value(0.25, 0.0, 1.0, 5.0, 10.0))
-        self.assertAlmostEqual(7.5, rescale_value(0.5,  0.0, 1.0, 5.0, 10.0))
-        self.assertAlmostEqual(8.75, rescale_value(0.75, 0.0, 1.0, 5.0, 10.0))
-        self.assertAlmostEqual(10.0, rescale_value(1.0,  0.0, 1.0, 5.0, 10.0))
-
-        self.assertAlmostEqual(-10.0, rescale_value(0.0,  0.0, 1.0, -10.0, 10.0))
-        self.assertAlmostEqual(-5.0, rescale_value(0.25, 0.0, 1.0, -10.0, 10.0))
-        self.assertAlmostEqual(0.0, rescale_value(0.5,  0.0, 1.0, -10.0, 10.0))
-        self.assertAlmostEqual(5.0, rescale_value(0.75, 0.0, 1.0, -10.0, 10.0))
-        self.assertAlmostEqual(10.0, rescale_value(1.0,  0.0, 1.0, -10.0, 10.0))
-
     def test_antialias(self):
         original = numpy.array([[0.5, 0.12, 0.7, 0.15, 0.0],
                                 [0.0, 0.12, 0.7, 0.7, 8.0],

worldengine/common.py

@@ -59,28 +59,6 @@ def print_self(self):
         sys.stdout.write(self.to_str)
 
 
-def matrix_min_and_max(matrix):
-    _min = None
-    _max = None
-    for row in matrix:
-        for el in row:
-            val = el
-            if _min is None or val < _min:
-                _min = val
-            if _max is None or val > _max:
-                _max = val
-    return _min, _max
-
-
-def rescale_value(original, prev_min, prev_max, min, max):
-    """Rescale a given value.
-    Given the value, the current min and max and the new min and max
-    produce the rescaled value
-    """
-    f = float(original - prev_min) / (prev_max - prev_min)
-    return min + ((max - min) * f)
-
-
 def anti_alias(map, steps):#TODO: There is probably a bit of numpy-optimization that can be done here.
     """
     Execute the anti_alias operation steps times on the given map