Changeset 594 for branches

Timestamp:

11/20/12 10:08:47 (3 years ago)

Author:

mmckerns

Message:

fix: correct more typos in test_wrapper

Location:

branches/decorate

Files:

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

branches/decorate/test_wrapper.py

@@ -101 +101 @@
 def test_bounded():
 
-  @bounded(min=1,max=10-1e-8)
+  @bounded(min=1,max=9.9999)
   def squared(x):
     return x**2
@@ -112 +112 @@
   x = array(x)
   y = squared(x)
-  assert y == [i**2 if i in range(1,10) else inf for i in x]
+  assert y == inf #XXX: better, [i**2 if i in range(1,10) else inf for i in x] ?
 
 
@@ -135 +135 @@
 
   assert discrete_squared(5.6) == 5.5**2
-  assert discrete_squared([1, 3]) == asarray([1.0, 3.5])**2
+  assert all(discrete_squared([1, 3]) == asarray([1.0, 3.5])**2)
   discrete_squared.samples([1.0, 7.0])
   assert discrete_squared(5.6) == 7.0**2

branches/decorate/wrapper.py

@@ -84 +84 @@
             def func(x, *args, **kwds):
                 if any((x<min)|(x>max)): #if violate bounds, evaluate as inf
-                    return inf
+                    return inf #XXX: better, return x with xi=inf where violate?
                 return f(x, *args, **kwds)
         else: