Changeset 831 for mystic/examples2/optqp.py

Timestamp:

09/28/15 20:45:46 (8 months ago)

Author:

mmckerns

Message:

add simplify to simplify equations for a single variable on the LHS;
use simplify in many examples where symbolic equations are given;
add comparator function, to determine the comparator ('<=', '=', etc);
add test_simplify to test_symbolic

File:

• mystic/examples2/optqp.py (modified) (2 diffs)

mystic/examples2/optqp.py

@@ -30 +30 @@
 from mystic.symbolic import generate_conditions, generate_penalty
 pf = generate_penalty(generate_conditions(equations), k=1e4)
+from mystic.symbolic import generate_constraint, generate_solvers, solve
+cf = generate_constraint(generate_solvers(solve(equations)))
 
 # inverted objective, used in solving for the maximum
@@ -40 +42 @@
   from mystic.math import almostEqual
 
-  result = diffev2(_objective, x0=bounds, bounds=bounds, penalty=pf, npop=40, ftol=1e-8, gtol=100, disp=False, full_output=True)
+  result = diffev2(_objective, x0=bounds, bounds=bounds, constraint=cf, penalty=pf, npop=40, ftol=1e-8, gtol=100, disp=False, full_output=True)
   assert almostEqual(result[0], xs, rel=2e-2)
   assert almostEqual(result[1], ys, rel=2e-2)
 
-  result = fmin_powell(_objective, x0=[-1.0,1.0], bounds=bounds, penalty=pf, disp=False, full_output=True)
+  result = fmin_powell(_objective, x0=[-1.0,1.0], bounds=bounds, constraint=cf, penalty=pf, disp=False, full_output=True)
   assert almostEqual(result[0], xs, rel=2e-2)
   assert almostEqual(result[1], ys, rel=2e-2)
 
 
-# EOD
+# EOF