Changeset 613 for branches

Timestamp:

12/18/12 10:25:00 (3 years ago)

Author:

mmckerns

Message:

added impose_product and impose_sum to mystic.math.measures;
allow generate_constraint to use mystic.math.measures

Location:

branches/decorate

Files:

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

branches/decorate/symbolic.py

@@ -92 +92 @@
 Inputs:
     constraints -- a string of symbolic constraints, with one constraint
-        equation per line. Constraints can be equality, inequality, mean,
-        and/or range constraints. Standard python syntax rules should be
-        followed (with the math module already imported).
+        equation per line. Constraints can be equality and/or inequality
+        constraints. Standard python syntax should be followed (with the
+        math and numpy modules already imported).
     variables -- list of variable name strings. The variable names will
         be replaced in the order that they are provided, where if the
@@ -164 +164 @@
 Inputs:
     constraints -- a string of symbolic constraints, with one constraint
-        equation per line. Constraints can be equality, inequality, mean,
-        and/or range constraints. Standard python syntax rules should be
-        followed (with the math module already imported).
+        equation per line. Constraints can be equality and/or inequality
+        constraints. Standard python syntax should be followed (with the
+        math and numpy modules already imported).
 
     For example:
@@ -249 +249 @@
             constraint = fixed.strip()
 
-            # Replace 'range', 'mean', and 'variance'
-            if constraint.find('range') != -1:
-                constraint = constraint.replace('range', 'ptp') # spread
-            if constraint.find('mean') != -1:
-                constraint = constraint.replace('mean', 'average') # mean
-            if constraint.find('variance') != -1:
-                constraint = constraint.replace('variance', 'var') # variance
-            #FIXME: also enable functions from mystic.math.measures ?
+            # Replace 'range', 'mean', and 'variance' (uses numpy, not mystic)
+            if constraint.find('range(') != -1:
+                constraint = constraint.replace('range(', 'ptp(') # spread
+            if constraint.find('mean(') != -1:
+                constraint = constraint.replace('mean(', 'average(') # mean
+            if constraint.find('variance(') != -1:
+                constraint = constraint.replace('variance(', 'var(') # variance
 
             # Sorting into equality and inequality constraints, and making all
@@ -321 +320 @@
             constraint = fixed.strip()
 
-            # Replace 'range', 'mean', and 'variance'
-            if constraint.find('range') != -1:
-                constraint = constraint.replace('range', 'ptp') # spread
-            if constraint.find('mean') != -1:
-                constraint = constraint.replace('mean', 'average') # mean
-            if constraint.find('variance') != -1:
-                constraint = constraint.replace('variance', 'var') # variance
-            #FIXME: also enable functions from mystic.math.measures ?
+            # Replace 'range', 'mean', and 'variance' (uses mystic, not numpy)
+            if constraint.find('range(') != -1:
+                constraint = constraint.replace('range(', 'spread(')
+            if constraint.find('ptp(') != -1:
+                constraint = constraint.replace('ptp(', 'spread(')
+            if constraint.find('average(') != -1:
+                constraint = constraint.replace('average(', 'mean(')
+            if constraint.find('var(') != -1:
+                constraint = constraint.replace('var(', 'variance(')
+            if constraint.find('prod(') != -1:
+                constraint = constraint.replace('prod(', 'product(')
 
             #XXX: below this line the code is different than penalty_parser
@@ -345 +347 @@
                    'rhs':split[-1].lstrip('=').strip()}
             expression = expression % eqn
+
+            # allow mystic.math.measures impose_* on LHS
+            lhs,rhs = expression.split('=')
+            if lhs.find('spread(') != -1:
+              lhs = lhs.split('spread')[-1]
+              rhs = ' impose_spread( (' + rhs.lstrip() + '),' + lhs + ')'
+            if lhs.find('mean(') != -1:
+              lhs = lhs.split('mean')[-1]
+              rhs = ' impose_mean( (' + rhs.lstrip() + '),' + lhs + ')'
+            if lhs.find('variance(') != -1:
+              lhs = lhs.split('variance')[-1]
+              rhs = ' impose_variance( (' + rhs.lstrip() + '),' + lhs + ')'
+            if lhs.find('sum(') != -1:
+              lhs = lhs.split('sum')[-1]
+              rhs = ' impose_sum( (' + rhs.lstrip() + '),' + lhs + ')'
+            if lhs.find('product(') != -1:
+              lhs = lhs.split('product')[-1]
+              rhs = ' impose_product( (' + rhs.lstrip() + '),' + lhs + ')'
+            expression = "=".join([lhs,rhs])
+
             parsed.append(expression)
 
@@ -355 +377 @@
 Inputs:
     constraints -- a string of symbolic constraints, with one constraint
-        equation per line. Constraints can be equality, inequality, mean,
-        and/or range constraints. Standard python syntax rules should be
-        followed (with the math module already imported).
+        equation per line. Constraints can be equality and/or inequality
+        constraints. Standard python syntax should be followed (with the
+        math and numpy modules already imported).
 
     For example:
@@ -388 +410 @@
     # default is globals with numpy and math imported
     globals = {}
-    code = """from math import *; from numpy import *"""
-   #code += """from mystic.math.measures import *""" #FIXME: enable mystic code?
+    code = """from math import *; from numpy import *;"""
+   #code += """from mystic.math.measures import spread, variance, mean;"""
     code = compile(code, '<string>', 'exec')
     exec code in globals
@@ -424 +446 @@
 Inputs:
     constraints -- a string of symbolic constraints, with one constraint
-        equation per line. Constraints can be equality, inequality, mean,
-        and/or range constraints. Standard python syntax rules should be
-        followed (with the math module already imported).  The left-hand
-        side of each equation must be simplified to support assignment.
+        equation per line. Constraints can be equality and/or inequality
+        constraints. Standard python syntax should be followed (with the
+        math and numpy modules already imported). The left-hand side of
+        each equation must be simplified to support assignment.
 
     For example:
@@ -458 +480 @@
     # default is globals with numpy and math imported
     globals = {}
-    code = """from math import *; from numpy import *"""
-   #code += """from mystic.math.measures import *""" #FIXME: enable mystic code?
+    code = """from math import *; from numpy import *;"""
+    code += """from mystic.math.measures import spread, variance, mean;"""
+    code += """from mystic.math.measures import impose_spread, impose_mean;"""
+    code += """from mystic.math.measures import impose_sum, impose_product;"""
+    code += """from mystic.math.measures import impose_variance;"""
     code = compile(code, '<string>', 'exec')
     exec code in globals

branches/decorate/test_symbolic.py

@@ -6 +6 @@
 
   constraints = """
-  x1**2 = 2.5*x4 - a      
+  x1**2 = 2.5*x4 - a
   exp(x3/x1) >= b"""
 
@@ -21 +21 @@
   assert almostEqual(penalty(constraint([1,0,0,2.4])), 0.0, 1e-10)
 
-
 def test_numpy_penalty():
 
   constraints = """
-  mean([x1, x2, x3]) = 5.0     
+  mean([x1, x2, x3]) = 5.0
   x1 = x2 + x3"""
 
@@ -39 +38 @@
   assert almostEqual(penalty(constraint([3,4,5])), 0.0, 1e-10)
 
+def test_impose_penalty():
+
+  constraints = """
+  mean([x1, x2, x3]) = 5.0
+  range([x1, x2, x3]) = 10.0"""
+
+  from mystic.math.measures import mean, spread
+  solv = generate_solvers(constraints)
+  assert almostEqual(mean(solv[0]([1,2,3])), 5.0)
+  assert almostEqual(spread(solv[1]([1,2,3])), 10.0)
+
+  constraint = generate_constraint(solv)
+  assert almostEqual(constraint([1,2,3]), [0.0,5.0,10.0], 1e-10)
+
 
 if __name__ == '__main__':
   test_generate_penalty()
   test_numpy_penalty()
+  test_impose_penalty()