Changeset 832

Timestamp:

09/30/15 23:53:28 (8 months ago)

Author:

mmckerns

Message:

handle corner case of solve with '0*xN'; add additional print for verbose

Location:

mystic/mystic

Files:

• _symbolic.py (modified) (2 diffs)
• symbolic.py (modified) (2 diffs)

mystic/mystic/_symbolic.py

@@ -391 +391 @@
 
     if not permute:
-        return None if not solns[:1] else solns[0]
+        sol = None if not solns[:1] else solns[0]
+        return '' if sol and not sol.strip() else sol
     return tuple(solns)
 
@@ -641 +642 @@
             soln = _solve_single(constraints, variables=variables, \
                                  target=target, **kwds)
+            # for corner case where has something like: '0*xN'
+            if not soln or not soln.strip():
+                if target in [None, False]: target = []
+                elif isinstance(target, str): target = target.split(',')
+                else: target = list(target)
+                soln = _solve_single(constraints, variables=variables, \
+                                     target=target[1:], **kwds)
         else:
             soln = _solve_linear(constraints, variables=variables, \

mystic/mystic/symbolic.py

@@ -176 +176 @@
         res = solve(eqn.replace(cmp,'='), target=target, **kwds)
         _eqn = res.replace('=',cmp)
-        if verbose: print _eqn
+        if verbose: print 'in: %s\nout: %s' % (eqn, _eqn)
         if not cmp.count('<')+cmp.count('>'):
             return _eqn 
@@ -182 +182 @@
         locals = kwds['locals'] if 'locals' in kwds else None
         if locals is None: locals = {}
-        locals.update(dict((var,rand()) for var in get_variables(res, vars)))
+        locals.update(dict((var,rand()) for var in get_variables(eqn, vars)))
+        if verbose: print locals
         locals_ = _locals.copy()
         locals_.update(locals) #XXX: allow this?