Changeset 612 for branches

Timestamp:

12/17/12 17:14:53 (3 years ago)

Author:

mmckerns

Message:

better substitution of mean and range for symbolic parser

Location:

branches/decorate

Files:

• symbolic.py (modified) (2 diffs)
• test_symbolic.py (modified) (1 diff)

branches/decorate/symbolic.py

@@ -249 +249 @@
             constraint = fixed.strip()
 
-            # Replace 'mean' with actual expression for calculating mean
+            # 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(asarray(x))')
-            # Replace 'range' with actual expression for calculating range
-            if constraint.find('range') != -1:
-                constraint = constraint.replace('range', 'max(x) - min(x)')
+                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 ?
 
@@ -320 +321 @@
             constraint = fixed.strip()
 
-            # Replace 'mean' with actual expression for calculating mean
+            # 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(asarray(x))')
-            # Replace 'range' with actual expression for calculating range
-            if constraint.find('range') != -1:
-                constraint = constraint.replace('range', 'max(x) - min(x)')
+                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 ?
 

branches/decorate/test_symbolic.py

@@ -22 +22 @@
 
 
+def test_numpy_penalty():
+
+  constraints = """
+  mean([x1, x2, x3]) = 5.0     
+  x1 = x2 + x3"""
+
+  ineq,eq = generate_conditions(constraints)
+  assert eq[0]([7,5,3]) == 0.0
+  assert eq[1]([7,4,3]) == 0.0
+
+  penalty = generate_penalty((ineq,eq))
+  assert penalty([9.0,5,4.0]) == 100.0
+  assert penalty([7.5,4,3.5]) == 0.0
+
+  constraint = as_constraint(penalty, solver='fmin')
+  assert almostEqual(penalty(constraint([3,4,5])), 0.0, 1e-10)
+
+
 if __name__ == '__main__':
   test_generate_penalty()
+  test_numpy_penalty()