Changeset 598 for branches

Timestamp:

11/21/12 19:22:46 (3 years ago)

Author:

mmckerns

Message:

added clip_bounded, target_bounded, and bounce_bounded decorators to wrapper

Location:

branches/decorate

Files:

• test_wrapper.py (modified) (2 diffs)
• wrapper.py (modified) (2 diffs)

branches/decorate/test_wrapper.py

@@ -113 +113 @@
   y = squared(x)
   assert y == inf #XXX: better, [i**2 if i in range(1,10) else inf for i in x] ?
+
+
+def test_clip_bounded():
+
+  @clip_bounded(min=1.0,max=9.9999)
+  def squared(x):
+    return x**2
+
+  from numpy import array, arange
+  x = range(11)
+  y = [squared(i) for i in x]
+  assert y == [min(max(i,1.0),9.9999)**2 for i in x]
+
+  y = squared(x)
+  assert all(y == array([min(max(i,1.0),9.9999)**2 for i in x]))
+
+
+def test_target_bounded():
+
+  @target_bounded(min=1.0,max=9.9999,target=5.0)
+  def squared(x):
+    return x**2
+
+  from numpy import array, arange
+  x = range(11)
+  y = [squared(i) for i in x]
+  assert y == [i**2 if 1.0 <= i <= 9.999 else 5.0**2 for i in x]
+
+  y = squared(x)
+  assert all(y == [i**2 if 1.0 <= i <= 9.9999 else 5.0**2 for i in x])
+
+
+def test_bounce_bounded():
+
+  from mystic.math.measures import impose_mean, mean
+
+  @bounce_bounded(min=1.0,max=9.9999)
+  def set_mean(x, m):
+    return impose_mean(m, x)
+
+  from numpy import array, arange
+  x = range(11)
+  assert round(mean(set_mean(x, 5.0)), 15) == 5.0
 
 
@@ -151 +194 @@
   test_mixedin()
   test_discrete()
+  test_clip_bounded()
+  test_target_bounded()
+  test_bounce_bounded()
 
 

branches/decorate/wrapper.py

@@ -113 +113 @@
 The function's input will be mapped to the given discrete set
 
->>> @decorate([1.0, 2.0])
+>>> @discrete([1.0, 2.0])
 ... def identity(x):
 ...   return x
@@ -154 +154 @@
 
 
+#FIXME: the following should preserve the input type
+def __clip_bound(x, amin, amax):
+  return max(min(x, amax), amin)
+clip_bound = vectorize(__clip_bound)
+
+def __bounce_bound(x, amin, amax):
+  if not x <= amax:
+    x = amax-(amax-amin)*((x-amax)/(x+amax))
+  if not x >= amin:
+    x = amin+(amax-amin)*((amin-x)/(amin+x))
+  return x
+bounce_bound = vectorize(__bounce_bound)
+
+def __target_bound(x, amin, amax, target):
+  if not x <= amax:
+    x = min(target, amax)
+  if not x >= amin:
+    x = max(target, amin)
+  return x
+target_bound = vectorize(__target_bound)
+
+"""
+def _clip_bound(x, amin, amax):
+  return [__clip_bound(xi,li,ui) for xi,li,ui in zip(x,amin,amax)]
+
+def _bounce_bound(x, amin, amax):
+  return [__bounce_bound(xi,li,ui) for xi,li,ui in zip(x,amin,amax)]
+
+def _target_bound(x, amin, amax, target):
+  return [__target_bound(xi,li,ui,target) for xi,li,ui in zip(x,amin,amax)]
+"""
+
+def clip_bounded(min, max):
+    def dec(f):
+        def func(x, *args, **kwds):
+            return f(clip_bound(x, min, max), *args, **kwds)
+        return func
+    return dec
+
+def bounce_bounded(min, max):
+    def dec(f):
+        def func(x, *args, **kwds):
+            return f(bounce_bound(x, min, max), *args, **kwds)
+        return func
+    return dec
+
+def target_bounded(min, max, target):
+    def dec(f):
+        def func(x, *args, **kwds):
+            return f(target_bound(x, min, max, target), *args, **kwds)
+        return func
+    return dec
+
+
 # EOF