From: Barton W. <wil...@us...> - 2009-10-28 11:10:40
|
Update of /cvsroot/maxima/maxima/share/contrib In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1281 Modified Files: to_poly_solver.mac Log Message: o Allow to_poly_solve_h to bailout sooner when it is unable to solve o Fix missing quote o load("topoly.lisp") ---> load("topoly") There are no unexpected errors with these changes. Index: to_poly_solver.mac =================================================================== RCS file: /cvsroot/maxima/maxima/share/contrib/to_poly_solver.mac,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- to_poly_solver.mac 25 Oct 2009 11:57:54 -0000 1.13 +++ to_poly_solver.mac 28 Oct 2009 11:10:25 -0000 1.14 @@ -21,14 +21,14 @@ /* Conditionally load to_poly (version 2 or later), grobner, lrats, opsubst, unwind_protect, and basic (push macro). */ -if get('to_poly,'version) = false then load("topoly.lisp"); +if get('to_poly,'version) = false then load("topoly"); if get('to_poly,'version) < 2 then error("You need to update 'to_poly' to version 2 or greater"); if not(?functionp('poly_reduced_grobner)) then load("grobner"); block([inflag : true], if not(member('fullratsubst, map('op, functions))) then load("lrats")); block([inflag : true], if not(member('lratsubst, map('op, functions))) then load("lrats")); if not(?functionp('opsubst)) then load("opsubst"); block([inflag : true], if not(member('push, map('op, macros))) then load("basic")); -if not(?functionp(simpfuncall)) then load("simplifying"); +if not(?functionp('simpfuncall)) then load("simplifying"); load("to_poly_solve_extra"); /* Return a lambda form that is the composition of the functions in the list l. @@ -533,6 +533,7 @@ nonfree : setdifference(nonfree, var_exception), esave : union(set_of_variables(eqs), nonfree), sol : to_poly_solve(eqs, nonfree, 'simpfuncs = simpfuncs, 'maxdepth = maxdepth, 'use_grobner = grob), + if opequal_p(sol, '%solve) then error("Unable to solve"), /* The solve process introduces new variables. Let %sol_vars be the set of variables introduced by to_poly_solve */ |