===================================================================
RCS file: /home/cvs/OpenXM_contrib/gmp/mpz/tests/Attic/t-gcd.c,v
retrieving revision 1.1
retrieving revision 1.1.1.2
diff -u -p -r1.1 -r1.1.1.2
--- OpenXM_contrib/gmp/mpz/tests/Attic/t-gcd.c	2000/01/10 15:35:28	1.1
+++ OpenXM_contrib/gmp/mpz/tests/Attic/t-gcd.c	2000/09/09 14:13:01	1.1.1.2
@@ -1,21 +1,21 @@
 /* Test mpz_gcd, mpz_gcdext, mpz_mul, mpz_tdiv_r, mpz_add, mpz_cmp,
    mpz_cmp_ui, mpz_init_set, mpz_set, mpz_clear.
 
-Copyright (C) 1991, 1993, 1994, 1996 Free Software Foundation, Inc.
+Copyright (C) 1991, 1993, 1994, 1996, 1997, 2000 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library.
 
 The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at your
 option) any later version.
 
 The GNU MP Library is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.
 
-You should have received a copy of the GNU Library General Public License
+You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
@@ -25,30 +25,31 @@ MA 02111-1307, USA. */
 #include "gmp-impl.h"
 #include "urandom.h"
 
-void mpz_refgcd (), debug_mp ();
+void debug_mp ();
 
 #ifndef SIZE
-#define SIZE 256 /* really needs to be this large to exercise corner cases! */
+#define SIZE 128
 #endif
 
 main (argc, argv)
      int argc;
      char **argv;
 {
-  mpz_t op1, op2;
-  mpz_t refgcd, gcd, s, t;
+  mpz_t op1, op2, x;
+  mpz_t gcd, gcd2, s, t;
   mpz_t temp1, temp2;
-  mp_size_t op1_size, op2_size;
+  mp_size_t op1_size, op2_size, x_size;
   int i;
-  int reps = 1000;
+  int reps = 2000;
 
   if (argc == 2)
      reps = atoi (argv[1]);
 
   mpz_init (op1);
   mpz_init (op2);
-  mpz_init (refgcd);
+  mpz_init (x);
   mpz_init (gcd);
+  mpz_init (gcd2);
   mpz_init (temp1);
   mpz_init (temp2);
   mpz_init (s);
@@ -58,61 +59,35 @@ main (argc, argv)
     {
       op1_size = urandom () % SIZE - SIZE/2;
       op2_size = urandom () % SIZE - SIZE/2;
+      x_size = urandom () % SIZE/2;
 
       mpz_random2 (op1, op1_size);
       mpz_random2 (op2, op2_size);
+      mpz_random2 (x, x_size);
+      mpz_mul (op1, op1, x);
+      mpz_mul (op2, op2, x);
 
-      mpz_refgcd (refgcd, op1, op2);
-
       mpz_gcd (gcd, op1, op2);
-      if (mpz_cmp (refgcd, gcd))
+      /* We know GCD will be at least X, since we multiplied in that factor.  */
+      if (mpz_cmp (gcd, x) < 0 && mpz_sgn (op1) != 0 && mpz_sgn (op2) != 0)
 	dump_abort (op1, op2);
 
-      mpz_gcdext (gcd, s, t, op1, op2);
-      if (mpz_cmp (refgcd, gcd))
+      mpz_gcdext (gcd2, s, t, op1, op2);
+      if (mpz_cmp (gcd, gcd2))
 	dump_abort (op1, op2);
 
+      mpz_gcdext (gcd2, s, NULL, op1, op2);
+      if (mpz_cmp (gcd, gcd2))
+	dump_abort (op1, op2);
+
       mpz_mul (temp1, s, op1);
       mpz_mul (temp2, t, op2);
-      mpz_add (gcd, temp1, temp2);
-      if (mpz_cmp (refgcd, gcd))
+      mpz_add (gcd2, temp1, temp2);
+      if (mpz_cmp (gcd, gcd2))
 	dump_abort (op1, op2);
     }
 
   exit (0);
-}
-
-void
-mpz_refgcd (g, x, y)
-     mpz_t g;
-     mpz_t x, y;
-{
-  mpz_t xx, yy;
-
-  mpz_init (xx);
-  mpz_init (yy);
-
-  mpz_abs (xx, x);
-  mpz_abs (yy, y);
-
-  for (;;)
-    {
-      if (mpz_cmp_ui (yy, 0) == 0)
-	{
-	  mpz_set (g, xx);
-	  break;
-	}
-      mpz_tdiv_r (xx, xx, yy);
-      if (mpz_cmp_ui (xx, 0) == 0)
-	{
-	  mpz_set (g, yy);
-	  break;
-	}
-      mpz_tdiv_r (yy, yy, xx);
-    }
-
-  mpz_clear (xx);
-  mpz_clear (yy);
 }
 
 dump_abort (op1, op2)