Changeset 781

Timestamp:

02/16/15 16:43:28 (15 months ago)

Author:

mmckerns

Message:

rename _bootstrap_decorate to _bootstrap_objective;
fix: diffev solver should _process_inputs in Step;
fix: random_state uses import if importlib is not found
fix: sympy can't do ptp, so don't test spread
fix: tuples don't have 'index' in 2.5, so convert When to list in test

Location:

mystic

Files:

• mystic/abstract_solver.py (modified) (2 diffs)
• mystic/differential_evolution.py (modified) (2 diffs)
• mystic/scipy_optimize.py (modified) (2 diffs)
• mystic/tools.py (modified) (1 diff)
• tests/test_compound_termination.py (modified) (2 diffs)
• tests/test_symbolic.py (modified) (2 diffs)
• tests/test_symbolic_basic.py (modified) (1 diff)

mystic/mystic/abstract_solver.py

@@ -590 +590 @@
         return cost
 
-    def _bootstrap_decorate(self, cost=None, ExtraArgs=None):
+    def _bootstrap_objective(self, cost=None, ExtraArgs=None):
         """HACK to enable not explicitly calling _RegisterObjective"""
         args = None
@@ -696 +696 @@
         """
         # HACK to enable not explicitly calling _RegisterObjective
-        cost = self._bootstrap_decorate(cost, ExtraArgs)
+        cost = self._bootstrap_objective(cost, ExtraArgs)
         # process and activate input settings
         settings = self._process_inputs(kwds)

mystic/mystic/differential_evolution.py

@@ -220 +220 @@
         Note that ExtraArgs should be a *tuple* of extra arguments"""
         # HACK to enable not explicitly calling _RegisterObjective
-        cost = self._bootstrap_decorate(cost, ExtraArgs)
+        cost = self._bootstrap_objective(cost, ExtraArgs)
+        # process and activate input settings
+        kwds['strategy'] = strategy  # override default strategy with None
+        settings = self._process_inputs(kwds)
+        for key in settings:
+            exec "%s = settings['%s']" % (key,key)
 
         if not len(self._stepmon): # do generation = 0
@@ -372 +377 @@
         Note that ExtraArgs should be a *tuple* of extra arguments"""
         # HACK to enable not explicitly calling _RegisterObjective
-        cost = self._bootstrap_decorate(cost, ExtraArgs)
+        cost = self._bootstrap_objective(cost, ExtraArgs)
+        # process and activate input settings
+        kwds['strategy'] = strategy  # override default strategy with None
+        settings = self._process_inputs(kwds)
+        for key in settings:
+            exec "%s = settings['%s']" % (key,key)
 
         if not len(self._stepmon): # do generation = 0

mystic/mystic/scipy_optimize.py

@@ -145 +145 @@
         Note that ExtraArgs should be a *tuple* of extra arguments"""
         # HACK to enable not explicitly calling _RegisterObjective
-        cost = self._bootstrap_decorate(cost, ExtraArgs)
+        cost = self._bootstrap_objective(cost, ExtraArgs)
         # process and activate input settings
         settings = self._process_inputs(kwds)
@@ -459 +459 @@
         Note that ExtraArgs should be a *tuple* of extra arguments"""
         # HACK to enable not explicitly calling _RegisterObjective
-        cost = self._bootstrap_decorate(cost, ExtraArgs)
+        cost = self._bootstrap_objective(cost, ExtraArgs)
         # process and activate input settings
         settings = self._process_inputs(kwds)

mystic/mystic/tools.py

@@ -142 +142 @@
         # convienence for passing in 'numpy'
         if module == 'numpy': module = 'numpy.random'
-        import importlib
-        rng = importlib.import_module(module)
+        try:
+            import importlib
+            rng = importlib.import_module(module)
+        except ImportError:
+            rng = __import__(module, fromlist=module.split('.')[-1:])
     elif module.__name__ == 'numpy': # convienence for passing in numpy
         from numpy import random as rng

mystic/tests/test_compound_termination.py

@@ -69 +69 @@
 
     assert len(_v) == len(_c) == len(_n) == 1
-    assert _v.index(v) == _c.index(c) == _n.index(n) == 0
-    assert _v.count(v) == _c.count(c) == _n.count(n) == 1
+    assert list(_v).index(v) == list(_c).index(c) == list(_n).index(n) == 0
+    assert list(_v).count(v) == list(_c).count(c) == list(_n).count(n) == 1
     assert v in _v and c in _c and n in _n
     assert v in v_and_c and c in v_and_c
@@ -84 +84 @@
     assert c in c_and_v and v in c_and_v
     assert c in c_or_v and v in c_or_v
-    assert c_and_v.index(c) == v_and_c.index(v)
-    assert c_and_v.index(v) == v_and_c.index(c)
-    assert c_or_v.index(c) == v_or_c.index(v)
-    assert c_or_v.index(v) == v_or_c.index(c)
+    assert list(c_and_v).index(c) == list(v_and_c).index(v)
+    assert list(c_and_v).index(v) == list(v_and_c).index(c)
+    assert list(c_or_v).index(c) == list(v_or_c).index(v)
+    assert list(c_or_v).index(v) == list(v_or_c).index(c)
     assert c_and_v in c_or__c_and_v and _c in c_or__c_and_v
 

mystic/tests/test_symbolic.py

@@ -62 +62 @@
 def test_solve_constraint():
 
+  # sympy can no longer do "spread([x0,x1])"... so use "x1 - x0"
   constraints = """
-  spread([x0,x1]) - 1.0 = mean([x0,x1])   
+  (x1 - x0) - 1.0 = mean([x0,x1])   
   mean([x0,x1,x2]) = x2"""
 
-  from mystic.math.measures import mean, spread
+  from mystic.math.measures import mean
   _constraints = solve(constraints)
   solv = generate_solvers(_constraints)
@@ -73 +74 @@
   assert all(x) == all([1.0, 5.0, 3.0])
   assert mean(x) == x[2]
-  assert spread(x[:-1]) - 1.0 == mean(x[:-1])
+  assert (x[1] - x[0]) - 1.0 == mean(x[:-1])
 
 

mystic/tests/test_symbolic_basic.py

@@ -125 +125 @@
     # print "symbolic string:\n", constraints_string.rstrip()
     pf = generate_penalty(generate_conditions(constraints_string))
+    cn = as_constraint(pf)
 
-    @inner(as_constraint(pf))
-    def cf(x):
-        return sum(x)
-
+    x0 = [1., 1., 1.]
+    assert almostEqual(pf(cn(x0)), 0.0, tol=1e-7)
     #XXX: implement: wrap_constraint( as_constraint(pf), sum, ctype='inner') ?
-    # print "c = constraints wrapped around sum(x)"
-    x0 = [1., 1., 1.]
-    # print "c(%s): %s\n" % (x0, cf(x0))
-    assert almostEqual(cf(x0), 0.133687558709, tol=1e-15)
 
 def test_varnamelist():