From aeda5ebcc5d6fa115c61e94350c01e010c5e2369 Mon Sep 17 00:00:00 2001
From: John Cremona <john.cremona@gmail.com>
Date: Wed, 26 Aug 2015 12:37:01 +0100
Subject: [PATCH] Bug fix for mwrank with test example added

---
 configure.ac           |  2 +-
 libsrc/eclib/options.h |  2 +-
 libsrc/mrank1.cc       | 32 +++++++++++++++++---------------
 tests/in/tmrank.in     |  1 +
 tests/out/tmrank.out   |  1 +
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index b10a0ee7..b967fe47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.65])
-AC_INIT([eclib], [20150510], [john.cremona@gmail.com])
+AC_INIT([eclib], [20150826], [john.cremona@gmail.com])
 AM_INIT_AUTOMAKE([-Wall])
 AC_MSG_NOTICE([Configuring eclib...])
 AC_CONFIG_SRCDIR([libsrc])
diff --git a/libsrc/eclib/options.h b/libsrc/eclib/options.h
index 6919f5b6..6e1b3e9f 100644
--- a/libsrc/eclib/options.h
+++ b/libsrc/eclib/options.h
@@ -27,7 +27,7 @@
 #define DEFAULT_VERBOSE 1
 #define DEFAULT_PRECISION 15
 #define DEFAULT_HLIMQ 10
-#define DEFAULT_NAUX 8
+#define DEFAULT_NAUX 15
 #define DEFAULT_HLIMC 0
 #define DEFAULT_TRACEEQUIV 0
 #define DEFAULT_PTL -99  // if not set manually will be set to same as verbose
diff --git a/libsrc/mrank1.cc b/libsrc/mrank1.cc
index 8c6cf810..933ad86a 100644
--- a/libsrc/mrank1.cc
+++ b/libsrc/mrank1.cc
@@ -645,13 +645,13 @@ void rank1::getquartics1()
   static bigint zero = BIGINT(0);
   IJ_curve = Curvedata(zero,zero,zero,-27*ii,-27*jj,0);  // don't minimise
 
-  if (posdisc) 
+  if (posdisc)
     {
       gettype(2);  // get type 2s first as they are a subgroup of index 1 or 2
-      if(!have_eggpoint) 
+      if(!(have_eggpoint || have_large_quartics))
 	gettype(1);
-    }  
-  else 
+    }
+  else
     {
       gettype(3);
     }
@@ -1401,12 +1401,12 @@ rank1::rank1(Curvedata* ec, int verb, int sel, long lim1, long lim2,long n_aux)
   long e0,e1,e2;
   if(!intlog2(n0,e0,0))
     {
-      success=0; 
-      cout<<"!!! Fatal error: n0=#E[2]="<<n0<<" is not a power of 2\n";
-      cout<<"Please inform author by email!\n";
+      success=0;
+      cout<<"\n\n!!! Fatal error in mwrank: n0=#E[2]="<<n0<<" is not a power of 2\n";
+      cout<<"This is a bug: please report!\n";
       return;
     }
-  
+
   posdisc = is_positive(d1728);
   npoints1=npoints2=0;
   n1=n2=1;
@@ -1461,7 +1461,9 @@ rank1::rank1(Curvedata* ec, int verb, int sel, long lim1, long lim2,long n_aux)
   long keep_n3 = n3, e3;
   if (!intlog2(n3,e3,1))
     {
-      cout<<"\n!!! n3 = "<<keep_n3<<" not a power of 2, rounding up to "<<n3<<"\n";
+      success=0;
+      cout<<"\n\n!!! Fatal error in mwrank: n3 ="<<keep_n3<<" not a power of 2\n";
+      cout<<"This is a bug: please report!\n";
     }
   long selmer_rank_B = rank_B + e3;
 
@@ -1473,7 +1475,7 @@ rank1::rank1(Curvedata* ec, int verb, int sel, long lim1, long lim2,long n_aux)
       if(!selmer_only) 
 	cout << "Sha     rank contribution from B=im(eps) = " << e3 << endl;
     }
-  
+
   long keep_n1=n1, keep_n2=n2;
   if (!intlog2(n1,e1,1))
     {
@@ -1485,13 +1487,13 @@ rank1::rank1(Curvedata* ec, int verb, int sel, long lim1, long lim2,long n_aux)
     }
   if (!intlog2(n2,e2,0))
     {
-      success=0; 
-      cout<<"\n\n!!! Fatal error: n2 = "<<keep_n2<<" not a power of 2\n";
-      cout<<"Please inform author by email!\n";
+      success=0;
+      cout<<"\n\n!!! Fatal error in eclib: n2 = "<<keep_n2<<" not a power of 2\n";
+      cout<<"This is a bug: please report!\n";
     }
-  
+
   long rank_A = e1-e0,  selmer_rank_A = e2-e0;
-    
+
   if(verbose)
     {
       if(!selmer_only) 
diff --git a/tests/in/tmrank.in b/tests/in/tmrank.in
index cefa4114..98a497c9 100644
--- a/tests/in/tmrank.in
+++ b/tests/in/tmrank.in
@@ -20,5 +20,6 @@
 0 1 0 9910 9815689	   8
 0 0 0 -6112 12325825	   8
 1 0 1 34318214642441646362435632562579908747 3184376895814127197244886284686214848599453811643486936756 15
+0 0 0 -532 -4374 1
 
 0  0  0         0              0    0
diff --git a/tests/out/tmrank.out b/tests/out/tmrank.out
index 37fb8a39..6937a18a 100644
--- a/tests/out/tmrank.out
+++ b/tests/out/tmrank.out
@@ -20,3 +20,4 @@ Curve [0,0,0,-6544,7375129] :	Rank = 8
 Curve [0,1,0,9910,9815689] :	Rank = 8  
 Curve [0,0,0,-6112,12325825] :	Rank = 8  
 Curve [1,0,1,34318214642441646362435632562579908747,3184376895814127197244886284686214848599453811643486936756] :	Rank = 15  
+Curve [0,0,0,-532,-4374] :	Rank = 1