On Sep 5, 2010, at 1:23 AM, smichr wrote: > Two comments on this commit: > > 1) I used to be able to cherry-pick changes from master to put on my > t2 branch (which is rebased on master) but now I get an error message. > I saw it a few times last night but can't generate it now. It > complained something about a merge status.
Why do you need to cherry-pick something from master if you are already rebased over master? Anyway, are you sure you aren't accidentally in the middle of a merge (git status)? > > 2) I've already incorparated several subs issues into a new subs > routine that uses the _subs_atoms. It works great and the suite > runtime has dropped by about 10%. The only changes I made were to that > commit were in Integral._subs_atoms as detailed in issue 2047 and a > small inline comment in Basic's version. I didn't remove the >2.4 > statement but will do so. I made several changes in the main subs > routine. subs_atoms wasn't reviewed negatively, it simply was not reviewed at all, and hence had to be removed from master until someone reviews it positively. > > Aaron has already found it controversial, but basically feeding subs a > dictionary or set results in a static, sorted-by-op-length > substitution. IMO we should remove as much ambiguity from the subs as > possible unless the user says otherwise. Using the 'exact' flag will > always result in a unique substitution. Could you be more specific on what change you are suggesting here? > > If you want to take a look (it's documented and there are tests) see > "subs-wild, atoms, exact, static" commit in t2 at github/smichr. Aaron Meurer -- You received this message because you are subscribed to the Google Groups "sympy-patches" group. To post to this group, send email to sympy-patc...@googlegroups.com. To unsubscribe from this group, send email to sympy-patches+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sympy-patches?hl=en.