Changeset 580 for branches

Timestamp:

10/16/12 14:38:03 (4 years ago)

Author:

mmckerns

Message:

add tests for 'wrapper' decorators

Location:

branches/decorate

Files:

• TEST_OUQ_surrogate_diam.py (deleted)
• test_wrapper.py (added)
• wrapper.py (modified) (2 diffs)

branches/decorate/wrapper.py

@@ -9 +9 @@
     """
     def dec(f):
-        def func(*args, **kwds):
+        def func(*args, **kwds): #FIXME: doesn't preserve function signature
             return f(inner(*args, **kwds))
         return func
@@ -98 +98 @@
 The resulting function is: f'(x) = scale * f(x) + shift * mixin(x).
 If normalized, then f' = f' / (scale + shift)"""
-  norm = 1.0
   def dec(f):
     def func(*args, **kwds):
+      norm = 1.0
       if normalized: norm = scale + shift
       return (scale * f(*args, **kwds) + shift * mixin(*args, **kwds)) / norm