Changeset 623 for branches

Timestamp:

12/26/12 19:53:09 (3 years ago)

Author:

mmckerns

Message:

some cleanup of imports in symbolic; _symbolic.solve now imported to solve

Location:

branches/decorate

Files:

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

branches/decorate/_symbolic.py

@@ -9 +9 @@
 # >>> soln = symsol([eq2, eq1], [x1, x2, x3])
 
-from symbolic import *
 from mystic.tools import permutations
+from mystic.tools import list_or_tuple_or_ndarray
 #from wrapper import isbounded
 #from penalty import issolution
@@ -51 +51 @@
         raise NotImplementedError, "cannot classify inequalities" 
 
+    from symbolic import replace_variables, get_variables
     #XXX: use solve? or first if not in form xi = ... ?
     if list_or_tuple_or_ndarray(variables):
@@ -171 +172 @@
         raise NotImplementedError, "cannot simplify inequalities" 
 
+    from symbolic import replace_variables, get_variables
     #XXX: if constraints contain x1,x2,x4 for 'x', should x3 be in code,xlist?
     if list_or_tuple_or_ndarray(variables):
@@ -274 +276 @@
         target = list(target) # not the best for ndarray, but should work
 
+    from symbolic import replace_variables, get_variables
     if list_or_tuple_or_ndarray(variables):
         if nvars: variables = variables[:nvars]
@@ -439 +442 @@
         target = list(target) # not the best for ndarray, but should work
 
+    from symbolic import replace_variables, get_variables
     if list_or_tuple_or_ndarray(variables):
         if nvars: variables = variables[:nvars]
@@ -468 +472 @@
     locals = kwds.get('locals', None)
     if locals is None: locals = {}
-    # if sympy not installed, call generate_constraint
+    # if sympy not installed, return original constraints
     try:
         code = """from sympy import Eq, Symbol;"""
@@ -697 +701 @@
         target = list(target) # not the best for ndarray, but should work
 
+    from symbolic import replace_variables, get_variables
     if list_or_tuple_or_ndarray(variables):
         if nvars: variables = variables[:nvars]

branches/decorate/symbolic.py

@@ -6 +6 @@
 from __future__ import division
 from numpy import ndarray, asarray
+from _symbolic import solve
+from mystic.tools import list_or_tuple_or_ndarray, flatten
 
 # XXX: another function for the inverse... symbolic to matrix? (good for scipy)
@@ -85 +87 @@
 
 
-from mystic.tools import list_or_tuple_or_ndarray, flatten
 def replace_variables(constraints, variables=None, markers='$'):
     """Replace variables in constraints string with a marker.

branches/decorate/test_symbolic.py

@@ -1 +1 @@
 from symbolic import *
-from _symbolic import *
 from mystic.math import almostEqual
 from penalty import as_constraint