Changeset 598 for branches/decorate/wrapper.py

Timestamp:

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

Author:

mmckerns

Message:

added clip_bounded, target_bounded, and bounce_bounded decorators to wrapper

File:

• branches/decorate/wrapper.py (modified) (2 diffs)

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