Changeset 604 for branches

Timestamp:

12/05/12 09:42:48 (3 years ago)

Author:

mmckerns

Message:

added SetPenalty? method for penalty functions, and penalty kwd for one-liners;
added wrap_penalty method to tools; use penalty kwd in decorate/test_penalty

Location:

branches/decorate

Files:

• test_penalty.py (modified) (1 diff)
• test_wrapper.py (modified) (1 diff)

branches/decorate/test_penalty.py

@@ -13 +13 @@
   @quadratic_equality(condition=range_constraint, kwds={'target':5.0})
   @quadratic_equality(condition=mean_constraint, kwds={'target':5.0})
-  def cost(x):                       #XXX: def penalty(x): return x
-    return abs(sum(x) - 5.0)         #XXX: # ...then give penalty to solver
+  def penalty(x):
+    return 0.0
+
+  def cost(x):
+    return abs(sum(x) - 5.0)
 
   from mystic.solvers import fmin_powell
   from numpy import array
   x = array([1,2,3,4,5])
-  y = fmin_powell(cost, x, disp=False)
+  y = fmin_powell(cost, x, penalty=penalty, disp=False)
 
   assert round(mean(y)) == 5.0

branches/decorate/test_wrapper.py

@@ -261 +261 @@
     return impose_spread(spread, x)
 
-  @nested(inner=range_constraint, kwds={'spread':5.0})  #XXX: @with_range(5.0)
-  @nested(inner=mean_constraint, kwds={'mean':5.0})     #XXX: @with_mean(5.0)
+  @nested(inner=range_constraint, kwds={'spread':5.0})
+  @nested(inner=mean_constraint, kwds={'mean':5.0})
   def constraints(x):
     return x