Changeset 737 for mystic/mystic/abstract_solver.py

Timestamp:

07/31/14 11:08:02 (22 months ago)

Author:

mmckerns

Message:

simplified internal reducer state to always use arraylike; added wrap_reducer

File:

• mystic/mystic/abstract_solver.py (modified) (4 diffs)

mystic/mystic/abstract_solver.py

@@ -78 +78 @@
 import numpy
 from numpy import inf, shape, asarray, absolute, asfarray
-from mystic.tools import wrap_function, wrap_nested
+from mystic.tools import wrap_function, wrap_nested, wrap_reducer
 from mystic.tools import wrap_bounds, wrap_penalty, reduced
 
@@ -146 +146 @@
         self._constraints     = lambda x: x
         self._penalty         = lambda x: 0.0
-        self._reducer         = (None, False)
+        self._reducer         = None
         self._cost            = (None, None)
         self._termination     = lambda x, *ar, **kw: False if len(ar) < 1 or ar[0] is False or kw.get('info',True) == False else '' #XXX: better default ?
@@ -220 +220 @@
       (e.g. lambda x,y: x+y), taking two scalars and producing a scalar."""
         if not reducer:
-            self._reducer = (None, True)
+            self._reducer = None
         elif not callable(reducer):
             raise TypeError, "'%s' is not a callable function" % reducer
-        else: #XXX: check for format: x' = reducer(x) ?
-            self._reducer = (reducer, arraylike) #XXX: bool(arraylike) ?
+        elif not arraylike:
+            self._reducer = wrap_reducer(reducer)   
+        else: #XXX: check if is arraylike?
+            self._reducer = reducer
         return
 
@@ -578 +580 @@
         cost = wrap_penalty(cost, self._penalty)
         cost = wrap_nested(cost, self._constraints)
-        if self._reducer[0]:
-            cost = reduced(*self._reducer)(cost) #XXX: decorated? as wrap_*?
+        if self._reducer:
+           #cost = reduced(*self._reducer)(cost) # was self._reducer = (f,bool)
+            cost = reduced(self._reducer, arraylike=True)(cost)
         # hold on to the 'wrapped' cost function
         self._cost = (cost, ExtraArgs)