Changeset 616 for branches

Timestamp:

12/19/12 17:34:01 (3 years ago)

Author:

mmckerns

Message:

added test_build_constraint, renamed test_generate_constraint in test_symbolic;
math from numpy in _symbolic consistent with symbolic;
prepent build_linear and build_nonlinear with an underscore (i.e. rename)

Location:

branches/decorate

Files:

• _symbolic.py (modified) (9 diffs)
• symbolic.py (modified) (4 diffs)
• test_symbolic.py (modified) (3 diffs)

branches/decorate/_symbolic.py

@@ -1 +1 @@
 from symbolic import *
+from wrapper import isbounded
+from penalty import issolution
 from mystic.tools import permutations
 
@@ -270 +272 @@
     # default is _locals with numpy and math imported
     # numpy throws an 'AttributeError', but math passes error to sympy
-    code = """from numpy import *; from math import *;""" #XXX: prefer math?
+    code = """from numpy import *; from math import *;""" # prefer math
+    code += """from numpy import mean as average;""" # use np.mean not average
+    code += """from numpy import var as variance;""" # look like mystic.math
+    code += """from numpy import ptp as spread;"""   # look like mystic.math
     code = compile(code, '<string>', 'exec')
     exec code in _locals
@@ -321 +326 @@
 
 
-def build_linear(constraints, variables='x', nvars=None, order=None, **kwds):
+def _build_linear(constraints, variables='x', nvars=None, order=None, **kwds):
     """Build a constraints function given a string of linear constraints.
 Returns a constraints function. 
@@ -334 +339 @@
         >>> constraints = '''x1 = x3 + 2.
         ...     x3 = x4*2.'''
-        >>> f = build_linear(constraints)
+        >>> f = _build_linear(constraints, nvars=4)
         >>> f([1.0, 0.0, 0.0, 1.0])
         [4.0, 0.0, 2.0, 1.0]
@@ -378 +383 @@
     redundancies, but that should be ok.
     """
-    # XXX: sympy fails on 'math' functions of variables (e.g. 'cos(x1)')
     strict = False # if True, force to use 'permutations' code
     warn = True  # if True, don't supress warning about old versions of sympy
@@ -551 +555 @@
         >>> constraints = '''x1 = x3 + 2.
         ...     x3 = x4*2.'''
-        >>> f = build_constraint(constraints)
+        >>> f = build_constraint(constraints, nvars=4)
         >>> f([1.0, 0.0, 0.0, 1.0])
         [4.0, 0.0, 2.0, 1.0]
+        >>> constraints = '''
+        ...     spread([x1,x2]) - 1.0 = mean([x1,x2])   
+        ...     mean([x1,x2,x3]) = x3'''
+        >>> f = _build_nonlinear(constraints)
+        >>> f([1.0, 2.0, 3.0])
+        [1.0, 5.0, 3.0]
 
 Additional Inputs:
@@ -581 +591 @@
         such that it does not immediately violate the given bounds.
 """
-    # XXX: sympy fails on 'math' functions of variables (e.g. 'cos(x1)')
     try:
-        return build_linear(constraints, variables=variables, \
-                            nvars=nvars, order=order, **kwds)
+        return _build_linear(constraints, variables=variables, \
+                             nvars=nvars, order=order, **kwds)
     except:
-        return build_nonlinear(constraints, variables=variables, \
-                               nvars=nvars, order=order, **kwds)
-
-
-def build_nonlinear(constraints, variables='x', nvars=None, order=None, **kwds):
+        return _build_nonlinear(constraints, variables=variables, \
+                                nvars=nvars, order=order, **kwds)
+
+
+def _build_nonlinear(constraints, variables='x', nvars=None, order=None,**kwds):
     """Build a constraints function given a string of nonlinear constraints.
 Returns a constraints function. 
@@ -602 +611 @@
     For example:
         >>> constraints = '''x2 = x4*3. + (x1*x3)**x1'''
-        >>> f = build_nonlinear(constraints)
+        >>> f = _build_nonlinear(constraints, nvars=5)
         >>> f([1.0, 1.0, 1.0, 1.0, 1.0])
         [1.0, 4.0, 1.0, 1.0, 1.0]
+        >>> constraints = '''
+        ...     spread([x1,x2]) - 1.0 = mean([x1,x2])   
+        ...     mean([x1,x2,x3]) = x3'''
+        >>> f = _build_nonlinear(constraints)
+        >>> f([1.0, 2.0, 3.0])
+        [1.0, 5.0, 3.0]
 
 Additional Inputs:
@@ -632 +647 @@
         such that it does not immediately violate the given bounds.
 """
-    # XXX: sympy fails on 'math' functions of variables (e.g. 'cos(x1)')
     strict = False # if True, force to use 'permutations' code
     warn = True  # if True, don't supress warning about old versions of sympy

branches/decorate/symbolic.py

@@ -264 +264 @@
             constraint = fixed.strip()
 
-            # Replace 'range', 'mean', and 'variance' (uses numpy, not mystic)
-            if constraint.find('range(') != -1:
-                constraint = constraint.replace('range(', 'ptp(') # spread
+            # Replace 'spread', 'mean', and 'variance' (uses numpy, not mystic)
+            if constraint.find('spread(') != -1:
+                constraint = constraint.replace('spread(', 'ptp(')
             if constraint.find('mean(') != -1:
-                constraint = constraint.replace('mean(', 'average(') # mean
+                constraint = constraint.replace('mean(', 'average(')
             if constraint.find('variance(') != -1:
-                constraint = constraint.replace('variance(', 'var(') # variance
+                constraint = constraint.replace('variance(', 'var(')
 
             # Sorting into equality and inequality constraints, and making all
@@ -350 +350 @@
             constraint = fixed.strip()
 
-            # Replace 'range', 'mean', and 'variance' (uses mystic, not numpy)
-            if constraint.find('range(') != -1:
-                constraint = constraint.replace('range(', 'spread(')
+            # Replace 'ptp', 'average', and 'var' (uses mystic, not numpy)
             if constraint.find('ptp(') != -1:
                 constraint = constraint.replace('ptp(', 'spread(')
@@ -441 +439 @@
     globals = {}
     code = """from math import *; from numpy import *;"""
+    code += """from numpy import mean as average;""" # use np.mean not average
    #code += """from mystic.math.measures import spread, variance, mean;"""
     code = compile(code, '<string>', 'exec')
@@ -511 +510 @@
     globals = {}
     code = """from math import *; from numpy import *;"""
+    code += """from numpy import mean as average;""" # use np.mean not average
     code += """from mystic.math.measures import spread, variance, mean;"""
     code += """from mystic.math.measures import impose_spread, impose_mean;"""

branches/decorate/test_symbolic.py

@@ -1 +1 @@
 from symbolic import *
+from _symbolic import *
 from mystic.math import almostEqual
 from penalty import as_constraint
@@ -38 +39 @@
   assert almostEqual(penalty(constraint([3,4,5])), 0.0, 1e-10)
 
-def test_impose_penalty():
+def test_generate_constraint():
 
   constraints = """
   mean([x1, x2, x3]) = 5.0
-  range([x1, x2, x3]) = 10.0"""
+  spread([x1, x2, x3]) = 10.0"""
 
   from mystic.math.measures import mean, spread
@@ -52 +53 @@
   assert almostEqual(constraint([1,2,3]), [0.0,5.0,10.0], 1e-10)
 
+def test_build_constraint():
+
+  constraints = """
+  spread([x1,x2]) - 1.0 = mean([x1,x2])   
+  mean([x1,x2,x3]) = x3"""
+
+  from mystic.math.measures import mean, spread
+  constraint = build_constraint(constraints)
+  x = constraint([1.0, 2.0, 3.0])
+  assert all(x) == all([1.0, 5.0, 3.0])
+  assert mean(x) == x[2]
+  assert spread(x[:-1]) - 1.0 == mean(x[:-1])
+
 
 if __name__ == '__main__':
   test_generate_penalty()
   test_numpy_penalty()
-  test_impose_penalty()
+  test_generate_constraint()
+  test_build_constraint()