Changeset 767

Timestamp:

11/11/14 15:02:35 (18 months ago)

Author:

mmckerns

Message:

convert tuple of degenerate solved values to dict format in _solve_single

File:

• mystic/mystic/_symbolic.py (modified) (2 diffs)

mystic/mystic/_symbolic.py

@@ -355 +355 @@
     if permute or not target: #XXX: the goal is solving *only one* equation
         code += '_xlist = %s\n' % ','.join(targeted)
-        code += '_xlist = [symsol(['+eqlist+'], [i]) for i in _xlist]\n'
+        code += '_elist = [symsol(['+eqlist+'], [i]) for i in _xlist]\n'
+        code += '_elist = [i if isinstance(i, dict) else {j:i[-1][-1]} for j,i in zip(_xlist,_elist)]\n'
         code += 'soln = {}\n'
-        code += '[soln.update(i) for i in _xlist if i]\n'
+        code += '[soln.update(i) for i in _elist if i]\n'
     else:
         code += 'soln = symsol([' + eqlist + '], [' + target[0] + '])\n'
        #code += 'soln = symsol([' + eqlist + '], [' + targeted[0] + '])\n'
+        code += 'soln = soln if isinstance(soln, dict) else {' + target[0] + ': soln[-1][-1]}\n'
     ########################################################################
 
@@ -535 +537 @@
         # returns: {x0: f(xn,...), x1: f(xn,...), ...}
         _code += 'soln = symsol([' + eqlist + '], [' + xlist + '])'
+        #XXX: need to convert/check soln similarly as in _solve_single ?
         if verbose: print _code
         _code = compile(_code, '<string>', 'exec')