Changeset 603 for branches

Timestamp:

12/04/12 19:55:29 (3 years ago)

Author:

mmckerns

Message:

added outer wrapper 'wrap' as opposed to inner wrapper 'nested'
added tests of with_* decorators

Location:

branches/decorate

Files:

• constraints.py (modified) (1 diff)
• test_constraints.py (added)
• test_wrapper.py (modified) (3 diffs)
• wrapper.py (modified) (1 diff)

branches/decorate/constraints.py

@@ -1 +1 @@
 # XXX: provide the below from measures, which from bounded?, and ...generic?
+# XXX: with_*** is a 'wrap' constraint, what about 'nested' constraints?
 
 from mystic.math.measures import *

branches/decorate/test_wrapper.py

@@ -1 +1 @@
 from wrapper import *
 from mystic.math import almostEqual
+
+def test_wrap():
+
+  def squared(x):
+    return x**2
+
+  @wrap(outer=squared) 
+  def plus_one_squared(x):
+    return x+1
+
+  from numpy import array
+  x = array([1,2,3,4,5])
+  assert all(plus_one_squared(x)) == all((x+1)**2)
+
 
 def test_nested():
@@ -14 +28 @@
   x = array([1,2,3,4,5])
   assert all(squared_plus_one(x)) == all(x**2 + 1)
+
+
+def test_wrap_constraint():
+
+  from mystic.math.measures import impose_mean, mean
+
+  def impose_constraints(x, mean, weights=None):
+    return impose_mean(mean, x, weights)
+
+  @wrap(outer=impose_constraints, kwds={'mean':5.0})
+  def mean_of_squared(x):
+    return [i**2 for i in x]
+
+  from numpy import array
+  x = array([1,2,3,4,5])
+  y = impose_mean(5, [i**2 for i in x])
+  assert mean(y) == 5.0
+  assert mean_of_squared(x) == y
 
 
@@ -249 +281 @@
 
 if __name__ == '__main__':
+  test_wrap()
   test_nested()
+  test_wrap_constraint()
   test_nested_constraint()
   test_proxified_constraint()

branches/decorate/wrapper.py

@@ -1 +1 @@
 #XXX: be mindful if the decorators restrict to functions that expect arrays
 #     compare against the originals for restrictions
+
+def wrap(outer=lambda x:x, args=None, kwds=None): #XXX: *args, **kwds ?
+    """wrap a function around another function: convert y = f(x) to y' = c(f(x))
+
+This is useful, for example, in nesting one constraint in another constraint.
+    """
+    if args is None: args=()
+    if kwds is None: kwds={}
+    def dec(f):
+        def func(x, *argz, **kwdz):
+            return outer(f(x, *argz, **kwdz), *args, **kwds)
+        return func
+    return dec
+
 
 def nested(inner=lambda x:x, args=None, kwds=None): #XXX: *args, **kwds ?