On Tue, Jun 17, 2008 at 1:49 PM, goric <[EMAIL PROTECTED]> wrote: > > Just a doc update to start :-) > > diff -r 2c92cefdd78e sympy/matrices/matrices.py > --- a/sympy/matrices/matrices.py Sun Jun 15 19:36:32 2008 +0200 > +++ b/sympy/matrices/matrices.py Tue Jun 17 13:46:51 2008 +0200 > @@ -436,7 +436,17 @@ > self.cols -= 1 > > def row_join(self, rhs): > - # concatenates two matrices along self's last and rhs's first > col > + """ > + Concatenates two matrices along self's last and rhs's first > column > + > + >>> from sympy import * > + >>> M = Matrix(3,3,lambda i,j: i+j) > + >>> V = Matrix(3,1,lambda i,j: 3+i+j) > + >>> M.row_join(V) > + [0,1,2,3] > + [1,2,3,4] > + [2,3,4,5] > + """ > assert self.lines == rhs.lines > newmat = self.zeronm(self.lines, self.cols + rhs.cols) > newmat[:,:self.cols] = self[:,:] > @@ -444,6 +454,18 @@ > return newmat > > def col_join(self, bott): > + """ > + Concatenates two matrices along self's last and bott's first > row > + > + >>> from sympy import * > + >>> M = Matrix(3,3,lambda i,j: i+j) > + >>> V = Matrix(1,3,lambda i,j: 3+i+j) > + >>> M.col_join(V) > + [0,1,2] > + [1,2,3] > + [2,3,4] > + [3,4,5] > + """ > assert self.cols == bott.cols > newmat = self.zeronm(self.lines+bott.lines, self.cols) > newmat[:self.lines,:] = self[:,:]
Thanks, unfortunately it doesn't apply for me: $ patch -p1 < p patching file sympy/matrices/matrices.py Hunk #1 FAILED at 436. Hunk #2 FAILED at 454. 2 out of 2 hunks FAILED -- saving rejects to file sympy/matrices/matrices.py.rej Could you please attach the patch to some issue, or send it to sympy-patches? Also, it sparse me time if you could also add the mercurial header with your name + email address. See: http://docs.sympy.org/sympy-patches-tutorial.html I am going to add there short instructions as well. Another option is for you to create a hg repo at: http://freehg.org/ and simply push all your patches in there, so that anyone can simply pull them to his repo. Thanks, Ondrej --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/sympy?hl=en -~----------~----~----~----~------~----~------~--~---
