Changeset 854

Timestamp:

12/31/15 05:13:28 (5 months ago)

Author:

mmckerns

Message:

minor tweaks; renamed penalize coupler to additive, renamed combine to combined

Location:

mystic

Files:

• examples2/g01_alt2.py (modified) (2 diffs)
• mystic/constraints.py (modified) (2 diffs)
• mystic/coupler.py (modified) (4 diffs)
• tests/test_combined.py (moved) (moved from mystic/tests/test_combine.py) (3 diffs)

mystic/examples2/g01_alt2.py

@@ -19 +19 @@
                     penalty6, penalty7, penalty8, penalty9
 
-from mystic.constraints import as_constraint, combine
+from mystic.constraints import as_constraint, combined
 from mystic.penalty import linear_inequality
 
@@ -25 +25 @@
              penalty6,penalty7,penalty8,penalty9)
 
-penalty = combine(*[linear_inequality(pi)(lambda x:0.) for pi in penalties])
+penalty = combined(*[linear_inequality(pi)(lambda x:0.) for pi in penalties])
 solver = as_constraint(penalty)
 

mystic/mystic/constraints.py

@@ -12 +12 @@
            'with_mean','with_variance','with_std','with_spread','normalized',
            'issolution','solve','discrete','integers','near_integers',
-           'unique','has_unique','impose_unique', 'combine']
+           'unique','has_unique','impose_unique', 'combined']
 
 from mystic.math.measures import *
@@ -428 +428 @@
 
 
-def combine(*penalties, **settings): #XXX: is this in the right module?
+def combined(*penalties, **settings): #XXX: is this in the right module?
     """combine several penalties into a single penalty function
 

mystic/mystic/coupler.py

@@ -116 +116 @@
 
 ####################################################
-def penalize_proxy(penalty=lambda x:0.0, args=None, kwds=None):
+def additive_proxy(penalty=lambda x:0.0, args=None, kwds=None):
     """penalize a function with another function: y = f(x) to y' = f(x) + p(x)
     
@@ -134 +134 @@
     return dec
 
-def penalize(penalty=lambda x:0.0, args=None, kwds=None):
+def additive(penalty=lambda x:0.0, args=None, kwds=None):
     """penalize a function with another function: y = f(x) to y' = f(x) + p(x)
     
@@ -146 +146 @@
     ... 
     >>> # equivalent to: (x+1) + (x**2) 
-    >>> @penalize(squared)
+    >>> @additive(squared)
     ... def constrain(x):
     ...   return x+1
@@ -163 +163 @@
     return dec
 
-#XXX: can do multiple @penalize; but better is compound penalty with And,Or,..?
+#XXX: can do multiple @additive; but better is compound penalty with And,Or,..?
 #XXX: create a counter for n += 1 ?
 

mystic/tests/test_combined.py

@@ -3 +3 @@
 '''
 
-from mystic.constraints import combine
+from mystic.constraints import combined
  
 
@@ -28 +28 @@
     p = (p1,p2,p3)
     p = [ptype(pi)(lambda x:0.) for pi in p]
-    penalty = combine(*p, k=k)
+    penalty = combined(*p, k=k)
     constraint = as_constraint(penalty, solver=solver)
 
@@ -59 +59 @@
 
     p = [as_penalty(ci, ptype) for ci in c]
-    penalty = combine(*p, k=k)
+    penalty = combined(*p, k=k)
     constraint = as_constraint(penalty, solver=solver)