On Dec 19, 12:37 pm, "John Cremona" <[EMAIL PROTECTED]> wrote:
Hi John,
> I have changed the mwrank source code so that non-minimal models are
> now handled properly. All the work is done on a minimal model, but
> points are mapped back to the input model if that is different.
> (Non-integral models are still not supported.)
>
> Note that it is not correct to say that this was a Sage-wrapping
> problem! The stand-alone mwrank binary used to manage this properly by
> converting to a minimal model before calling the two_descent class,
> and the latter just assumed it was being given a minimal model. The
> Sage wrapping went straight into the two_descent. Now, the two_descent
> class handles this itself (so that the mwrank.cc program has less to
> do).
Excellent.
> I will attach a bundle which corrects this; it should be possible to
> apply this to the cremona*.spkg in Sage 2.9.
>
> No, that failed, since it did not recognise the parent. Help!
>
> I tried three different things for the --base in creating the bundle,
> after looking carefully at the changeset numbers in the current
> cremona*spkg, but trac would not allow me to upload any of them,
> saying that it did not recognise the parent.
>
> So far my experience with hg has been that it is tolerable when I am
> working on my own, but impossible to actually share changes in
> practice. I have read the manual. I know that it all works
> perfectly for everyone else but me. I don't want to spend the rest of
> my sage-devel life emailing patches to mabshoff.
Nothing wrong with that, I don't mind doing the integration.
> What am I doing wrong?!!
I assume you might have tried to unbundle against the wrong repo
since there are two in that spkg, on in the root directory and on in
src. You need to apply against the one in src. That works for me:
[EMAIL PROTECTED]:/tmp/Work-mabshoff/sage-2.9.1.alpha1/spkg/standard/
cremona-20071124.p5/src$ hg unbundle ~/jec-20071219.hg
adding changesets
adding manifests
adding file changes
added 16 changesets with 28 changes to 131 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
[EMAIL PROTECTED]:/tmp/Work-mabshoff/sage-2.9.1.alpha1/spkg/standard/
cremona-20071124.p5/src$ hg heads
changeset: 60:38b80d9b4edb
tag: tip
user: John Cremona <[EMAIL PROTECTED]>
date: Wed Dec 19 11:11:18 2007 +0000
summary: two_descent class now works with nonminimal curves
changeset: 44:d371669a38e4
user: [EMAIL PROTECTED]
date: Tue Dec 18 13:38:30 2007 -0800
summary: Apply John Cremona's initilization fix for qcurves/
sieve_search.cc
[EMAIL PROTECTED]:/tmp/Work-mabshoff/sage-2.9.1.alpha1/spkg/standard/
cremona-20071124.p5/src$ hg merge 38b80d9b4edb
merging Makefile
conflicts detected in /tmp/Work-mabshoff/sage-2.9.1.alpha1/spkg/
standard/cremona-20071124.p5/src/Makefile
/tmp/Work-mabshoff/sage-2.9.1.alpha1/spkg/standard/cremona-20071124.p5/
src/Makefile contains conflict markers.
Keep this version? [y/n]
y
merging procs/interface.h
merging qcurves/reader.h
conflicts detected in /tmp/Work-mabshoff/sage-2.9.1.alpha1/spkg/
standard/cremona-20071124.p5/src/qcurves/reader.h
/tmp/Work-mabshoff/sage-2.9.1.alpha1/spkg/standard/cremona-20071124.p5/
src/qcurves/reader.h contains conflict markers.
Keep this version? [y/n]
y
merging qrank/getcurve.cc
21 files updated, 4 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
But as you can see above I have two merge conflicts. So can you send
me a tarball of the complete repo of the code off-list (or post a link
so I can download it) and I will drop that vanilla repo into the spkg
and so some testing to make sure everything is still working as
expected. That way we will also avoid merge conflicts down the road.
> John
> --
> John Cremona
Cheers,
Michael
> jec-20071219.hg
> 59KDownload
--~--~---------~--~----~------------~-------~--~----~
To post to this group, send email to sage-devel@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at http://groups.google.com/group/sage-devel
URLs: http://sage.scipy.org/sage/ and http://modular.math.washington.edu/sage/
-~----------~----~----~----~------~----~------~--~---
