-

cool-RR · cool-RR · commit 5b3ce03c31da · 2013-09-17T23:37:57.000+03:00
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [nosetests]
-where=source_py3/test_python_toolbox
+where=source_py2/test_python_toolbox
 
 verbosity=3
 detailed-errors=1
diff --git a/source_py2/python_toolbox/cute_iter_tools.py b/source_py2/python_toolbox/cute_iter_tools.py
@@ -5,6 +5,7 @@
 # todo: make something like `filter` except it returns first found, or raises
 # exception
 
+from __future__ import division
 from __future__ import with_statement
 
 import collections
diff --git a/source_py3/python_toolbox/cute_iter_tools.py b/source_py3/python_toolbox/cute_iter_tools.py
@@ -259,4 +259,28 @@ def make_false_iterator():
 
 
 
+def get_ratio(filter_function, iterable):
+    if isinstance(filter_function, str):
+        attribute_name = filter_function
+        filter_function = lambda item: getattr(item, attribute_name, None)
+    n_total_items = 0
+    n_passed_items = 0
+    for item in iterable:
+        n_total_items += 1
+        if filter_function(item):
+            n_passed_items += 1
+    return n_passed_items / n_total_items
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
diff --git a/source_py3/python_toolbox/math_tools.py b/source_py3/python_toolbox/math_tools.py
@@ -3,10 +3,10 @@
 
 '''This module defines math-related tools.'''
 
-
-
 import numbers
 
+infinity = float('inf')
+
 
 def get_sign(x):
     '''Get the sign of a number.'''
@@ -85,4 +85,19 @@ def get_mean(iterable):
     for i, value in enumerate(iterable):
         sum_ += value
     return sum_ / (i + 1)
+        
+        
+def restrict_number_to_range(number, low_cutoff=-infinity,
+                             high_cutoff=infinity):
+    '''
+    If `number` is not in the range between cutoffs, return closest cutoff.
+    
+    If the number is in range, simply return it.
+    '''
+    if number < low_cutoff:
+        return low_cutoff
+    elif number > high_cutoff:
+        return high_cutoff
+    else:
+        return number
         
diff --git a/source_py3/test_python_toolbox/test_cute_iter_tools/test_get_ratio.py b/source_py3/test_python_toolbox/test_cute_iter_tools/test_get_ratio.py
@@ -0,0 +1,9 @@
+# Copyright 2009-2013 Ram Rachum.
+# This program is distributed under the MIT license.
+
+from python_toolbox import cute_iter_tools
+
+
+def test():
+    ratio = cute_iter_tools.get_ratio('real', [1, 2, 3, 1j, 2j, 3j, 4j])
+    assert ratio == 3 / 7
diff --git a/source_py3/test_python_toolbox/test_math_tools/test_restrict_number_to_range.py b/source_py3/test_python_toolbox/test_math_tools/test_restrict_number_to_range.py
@@ -0,0 +1,18 @@
+# Copyright 2009-2013 Ram Rachum.
+# This program is distributed under the MIT license.
+
+
+import sys
+
+import nose
+
+from python_toolbox.math_tools import restrict_number_to_range
+
+
+def test_restrict_number_to_range():
+    my_restrict = lambda number: restrict_number_to_range(number, 
+                                                          low_cutoff=3.5, 
+                                                          high_cutoff=7.8)
+    assert list(map(my_restrict, range(10))) == [
+        3.5, 3.5, 3.5, 3.5, 4, 5, 6, 7, 7.8, 7.8
+    ]
