Re: B-splines and Piecewise branch for review

2010-03-25 Thread Ondrej Certik
On Wed, Mar 24, 2010 at 9:58 PM, Brian Granger ellisonbg@gmail.com wrote: OK I have fixed all the doctests and also merged from upstream, so my branch should merge cleanly. The tests seem to run fine. Only I'll try to rebase it, it will make it easier to review. There are some conflicts,

Re: B-splines and Piecewise branch for review

2010-03-25 Thread Brian Granger
Ondrej, The tests seem to run fine. Only I'll try to rebase it, it will make it easier to review. There are some conflicts, that I'll try to fix. I am a little surprised there were conflicts. I pulled from upstream and resolved conflicts already (just tonight). They were in piecewise and

Re: B-splines and Piecewise branch for review

2010-03-25 Thread Ondrej Certik
On Wed, Mar 24, 2010 at 11:41 PM, Brian Granger ellisonbg@gmail.com wrote: Ondrej, The tests seem to run fine. Only I'll try to rebase it, it will make it easier to review. There are some conflicts, that I'll try to fix. I am a little surprised there were conflicts.  I pulled from

Re: B-splines and Piecewise branch for review

2010-03-25 Thread Brian Granger
Ondrej, I just don't like the way you resolved them.  Seems like you were merging branches, which both contained some of your patches and in general it was a big mess. I fixed all of that and pushed things here: Yes, I think I know what happened and I am not surprised that I made a mess.

Re: B-splines and Piecewise branch for review

2010-03-25 Thread Ondrej Certik
On Thu, Mar 25, 2010 at 9:34 AM, Brian Granger ellisonbg@gmail.com wrote: Ondrej, I just don't like the way you resolved them.  Seems like you were merging branches, which both contained some of your patches and in general it was a big mess. I fixed all of that and pushed things here:

Re: B-splines and Piecewise branch for review

2010-03-25 Thread Brian Granger
Thanks! On Thu, Mar 25, 2010 at 10:41 AM, Ondrej Certik ond...@certik.cz wrote: On Thu, Mar 25, 2010 at 9:34 AM, Brian Granger ellisonbg@gmail.com wrote: Ondrej, I just don't like the way you resolved them.  Seems like you were merging branches, which both contained some of your

Re: B-splines and Piecewise branch for review

2010-03-24 Thread Brian Granger
OK I have fixed all the doctests and also merged from upstream, so my branch should merge cleanly. Cheers, Brian On Tue, Mar 23, 2010 at 11:30 AM, Brian Granger ellisonbg@gmail.com wrote: Darn, I will look into this... Brian On Mon, Mar 22, 2010 at 2:04 PM, Aaron S. Meurer

Re: B-splines and Piecewise branch for review

2010-03-23 Thread Brian Granger
Darn, I will look into this... Brian On Mon, Mar 22, 2010 at 2:04 PM, Aaron S. Meurer asmeu...@gmail.com wrote: Sorry, I get some errors:  

Re: B-splines and Piecewise branch for review

2010-03-22 Thread Aaron S. Meurer
Sorry, I get some errors: sympy/utilities/tests/test_code_quality.py:test_no_trailing_whitespace_and_no_tabs File /users/aaronmeurer/documents/python/sympy/sympy/sympy/utilities/tests/test_code_quality.py,

Re: B-splines and Piecewise branch for review

2010-03-21 Thread Brian Granger
OK, I have addressed all review comments. My branch should be ready to merge. Cheers, Brian On Thu, Mar 18, 2010 at 4:11 PM, Brian Granger ellisonbg@gmail.com wrote: I am going to try to get on this soon. Cheers, Brian On Fri, Mar 12, 2010 at 10:10 AM, Aaron S. Meurer

Re: B-splines and Piecewise branch for review

2010-03-18 Thread Brian Granger
I am going to try to get on this soon. Cheers, Brian On Fri, Mar 12, 2010 at 10:10 AM, Aaron S. Meurer asmeu...@gmail.com wrote: Seenu comment at github. Aaron Meurer Sent from my iPod touch. On Mar 10, 2010, at 4:08 PM, Brian Granger ellisonbg@gmail.com wrote: Hi, I have improved

B-splines and Piecewise branch for review

2010-03-10 Thread Brian Granger
Hi, I have improved the Piecewise class and implemented B-splines. Here is the branch on github: http://github.com/ellisonbg/sympy/tree/bg-piecewise There are tests for everything I have added and docstrings/doctests. I would love comments and feedback. Cheers, Brian -- You received this

Re: B-splines and Piecewise branch for review

2010-03-10 Thread Priit Laes
Ühel kenal päeval, K, 2010-03-10 kell 15:08, kirjutas Brian Granger: Hi, I have improved the Piecewise class and implemented B-splines. Here is the branch on github: http://github.com/ellisonbg/sympy/tree/bg-piecewise It might be offtopic, but Github has implemented nice branch compare