Changeset 87 for python/tools.py

Timestamp:

02/05/09 20:28:35 (7 years ago)

Author:

mmckerns

Message:

added tools.wrap_bounds; added range bounds to fmin (modified from park.simplex)

File:

• python/tools.py (modified) (1 diff)

python/tools.py

@@ -189 +189 @@
     return ncalls, function_wrapper
 
+def wrap_bounds(function, min=None, max=None):
+    from numpy import asarray, any, inf
+    bounds = True
+    if min is not None and max is not None: #has upper & lower bound
+        min = asarray(min)
+        max = asarray(max)
+    elif min is not None: #has lower bound
+        min = asarray(min)
+        max = asarray([inf for i in min])
+    elif max is not None: #has upper bound
+        max = asarray(max)
+        min = asarray([-inf for i in max])
+    else: #not bounded
+        bounds = False
+    if bounds:
+        def function_wrapper(x):
+            if any((x<min)|(x>max)): #if violate bounds, evaluate as inf
+                return inf
+            return function(x)
+    else:
+        def function_wrapper(x):
+            return function(x)
+    return function_wrapper
+
 def wrap_cf(CF, REG=None, cfmult = 1.0, regmult = 0.0):
     def _(*args, **kwargs):