Index: Tst/Short/gcdp_s.tst
===================================================================
--- Tst/Short/gcdp_s.tst	(revision ddcc780f481f53c99fd39a75ee518337fb3067da)
+++ Tst/Short/gcdp_s.tst	(revision 4b81a90c3f6bc361d9b9c387ddbf77258b90d782)
@@ -1,15 +1,21 @@
-// $Id: gcdp_s.tst,v 1.1.1.1 1998-04-17 15:07:40 obachman Exp $
+// $Id: gcdp_s.tst,v 1.2 1998-04-21 15:59:58 schmidt Exp $
 
 //
 // gcdp_s.tst - short tests for gcd calculations mod p.
 //
-// Note: gcd(0, x) fails with a SEGV signal!
-// To Do: gcd calculations over transcendental extensions of
-// finite fields.
+// All univariate non-trivial examples come from gcdUnivP.fex
+// or gcdUnivPAlpha.fex.
+//
+// The example in variables `a', `c', `e', ... came from `untitled2(6/p/1)'
+// in stdMultivPGcd.in.
+//
+// To Do:
+//
+// o multivariate gcd calculations with parameters
 //
 
 LIB "tst.lib";
 tst_init();
-tst_ignore("CVS ID  : $Id: gcdp_s.tst,v 1.1.1.1 1998-04-17 15:07:40 obachman Exp $");
+tst_ignore("CVS ID  : $Id: gcdp_s.tst,v 1.2 1998-04-21 15:59:58 schmidt Exp $");
 
 //
@@ -17,4 +23,5 @@
 //
 
+tst_ignore( "ring r1=32003,x,dp;" );
 ring r1=32003,x,dp;
 
@@ -27,7 +34,6 @@
 gcd(4353, 0);
 
-// these examples fail so far!!!
-// gcd(0, f);
-// gcd(f, 0);
+gcd(0, f);
+gcd(f, 0);
 
 gcd(23123, f);
@@ -47,20 +53,9 @@
 gcd(f, g);
 
-f=106*x^13-583*x^12-1060*x^11+8056*x^10+1696*x^9-327*x^8+12508*x^7+8277*x^6+5609*x^5-12879*x^4+13144*x^3-2544*x^2;
-g=11118*x^14-5404*x^13-908*x^12-13908*x^11+3188*x^10-8818*x^9+10439*x^8-14811*x^7+15530*x^6-4891*x^5+6322*x^4+15829*x^3-13686*x^2;
-gcd(f, g);
-
-f=-14613*x^17+2235*x^16-298*x^15+4540*x^14+7214*x^13+5494*x^12-3122*x^11-4720*x^10+8300*x^9-6582*x^8-9908*x^7-15983*x^6-5802*x^5-8634*x^4+7899*x^3+10556*x^2+6931*x+11063;
-g=-10168*x^20+6674*x^19+3004*x^18+13113*x^17+9449*x^16+9097*x^15-6420*x^14+50*x^13+434*x^12-15226*x^11+3727*x^10-14065*x^9-9751*x^8-15792*x^7+6004*x^6-5059*x^5+2479*x^4-12504*x^3-11328*x^2-11338*x-8280;
-gcd(f, g);
-
-f=3812*x^22-6874*x^21+12586*x^20+3003*x^19-9568*x^18+11117*x^17 +7524*x^16+11138*x^15-9743*x^14+1892*x^13+12485*x^12-569*x^11-8265*x^10-5991*x^9+13701*x^8+2644*x^7-3936*x^6-15875*x^5+1289*x^4+3956*x^3-10099*x^2-6616*x+5401;
-g=10652*x^20-4144*x^19-11810*x^18+8237*x^17-8675*x^16+6545*x^15-3601*x^14+14559*x^13+8090*x^12-8378*x^11+14255*x^10+8767*x^9-13932*x^8+11602*x^7-10751*x^6-4899*x^5+8637*x^4+14084*x^3-11583*x^2+5882*x+885;
-gcd(f, g);
-
 //
-// - ring r2=(32003,a),x,dp.
+// - ring r2=(32003,a),x,dp; minpoly=a^4+8734*a^3+a^2+11817*a+1.
 //
 
+tst_ignore( "ring r2=(32003,a),x,dp;" );
 ring r2=(32003,a),x,dp;
 minpoly=a^4+8734*a^3+a^2+11817*a+1;
@@ -69,12 +64,11 @@
 poly g;
 
-// first, some of the above examples
+// first, some of the r1 examples
 gcd(0, 0);
 gcd(0, 3123);
 gcd(4353, 0);
 
-// these examples fail so far!!!
-// gcd(0, f);
-// gcd(f, 0);
+gcd(0, f);
+gcd(f, 0);
 
 gcd(23123, f);
@@ -91,8 +85,4 @@
 
 // now, examples involving the algebraic variable
-f=(25836*a^3*x^6+30467*a^2*x^6+26792*a*x^6+30467*x^6+27083*a^3*x^5+30808*a^2*x^5+28163*a*x^5+292*x^5+12440*a^3*x^4+19396*a^2*x^4+19616*a*x^4+23236*x^4+25156*a^3*x^3+31764*a^2*x^3+31235*a*x^3+6459*x^3);
-g=(14670*a^3*x^6+19715*a^2*x^6+22318*a*x^6+19715*x^6+19743*a^3*x^5+28179*a^2*x^5+19715*a*x^5+7335*x^5+6379*a^3*x^4+11397*a^2*x^4+23599*a*x^4+9861*x^4+16005*a^3*x^3+31525*a^2*x^3+30467*a*x^3+12918*x^3);
-gcd(f, g);
-
 f=(21147*a^3*x^5+10147*a^3*x^4+8142*a^2*x^4+27671*a*x^4+29289*x^4+29289*a^3*x^3);
 g=(6167*a^3*x^6+1536*a^2*x^6+5211*a*x^6+1536*x^6+17534*a^3*x^5+478*a^2*x^5+1536*a*x^5+19085*x^5+3203*a^3*x^4+26578*a^2*x^4+17052*a*x^4+26770*x^4+26002*a^3*x^3+24062*a^2*x^3+192*a*x^3+6386*x^3);
@@ -102,3 +92,98 @@
 g=(8192*a^3*x^10+8957*a^2*x^10+9659*a^3*x^9+28672*a^2*x^9+4553*a*x^9+12288*x^9+5819*a^3*x^8+320*a^2*x^8+14380*a*x^8+12104*x^8+12047*a^3*x^7+19823*a^2*x^7+6824*a*x^7+4335*x^7+29376*a^3*x^6+22190*a^2*x^6+31239*a*x^6+22647*x^6);
 gcd(f, g);
+
+//
+// - ring r3=(32003,t),x,dp.
+//
+
+tst_ignore( "ring r3=(32003,t),x,dp;" );
+ring r3=(32003,t),x,dp;
+
+poly f=(-9554*x^4-12895*x^3-10023*x^2-6213*x);
+poly g;
+
+// first, some of the r1 examples (slightly modified)
+gcd(0, 0);
+gcd(0, 3123*t);
+gcd(4353, 0);
+
+gcd(0, f/t);
+gcd(f, 0);
+
+gcd(23123/t, f);
+gcd(f, 13123);
+
+// some less trivial examples
+f=-9554*x^4-12895*x^3-10023*x^2-6213*x;
+g=-9554*x^3-3341*x^2+6213*x;
+gcd(f, g);
+
+// we go on with modified variable names
+tst_ignore( "ring r3=(32003,a,c,e),(f,h,k),dp;" );
+kill r3;
+ring r3=(32003,a,c,e),(f,h,k),dp;
+
+poly fPoly;
+poly gPoly;
+
+fPoly=(16001*c^2*f^2*k^2-16001*c*e*f*k^3+c*f^3*h*k-e*f^2*h*k^2);
+gPoly=(c^3*e*f*h-4*c*e^2*f*h^2);
+gcd(fPoly, gPoly);
+
+fPoly=(c^4*k^2-5*c^3*f*h*k+4*c^2*e*h*k^2+4*c^2*f^2*h^2-4*c*e*f*h^2*k);
+gPoly=(-c^3*f*k^2+c^2*e*k^3+2*c^2*f^2*h*k-2*c*e*f*h*k^2);
+gcd(fPoly, gPoly);
+
+fPoly=(-8001*c^4*e*f*k^6+8001*c^4*f^3*h*k^4+8001*c^3*e^2*k^7+8001*c^3*e*f^2*h*k^5+16001*c^3*f^4*h^2*k^3+16001*c^2*e^2*f*h*k^6-16001*c^2*e*f^3*h^2*k^4);
+gPoly=(16001*c^7*e*h*k^3-15998*c^6*e*f*h^2*k^2-7*c^5*e*f^2*h^3*k-8*c^4*e^2*f*h^3*k^2+4*c^4*e*f^3*h^4+8*c^3*e^3*h^3*k^3+24*c^3*e^2*f^2*h^4*k-24*c^2*e^3*f*h^4*k^2-16*c^2*e^2*f^3*h^5+16*c*e^3*f^2*h^5*k);
+gcd(fPoly, gPoly);
+
+//
+// - ring r4=32003,(t,x),dp.
+//
+// The examples from r4 are those from r3 with parameters
+// changed to ring variables.
+//
+
+tst_ignore( "ring r4=32003,(t,x),dp;" );
+ring r4=32003,(t,x),dp;
+
+poly f=(-9554*x^4-12895*x^3-10023*x^2-6213*x);
+poly g;
+
+// first, some of the r1 examples (slightly modified)
+gcd(0, 0);
+gcd(0, 3123*t);
+gcd(4353, 0);
+
+gcd(0, f);
+gcd(f, 0);
+
+gcd(23123*t, f);
+gcd(f, 13123);
+
+// some less trivial examples
+f=-9554*x^4-12895*x^3-10023*x^2-6213*x;
+g=-9554*x^3-3341*x^2+6213*x;
+gcd(t*f, g);
+
+// we go on with modified variable names
+tst_ignore( "ring r4=32003,(a,c,e,f,h,k),dp;" );
+kill r4;
+ring r4=32003,(a,c,e,f,h,k),dp;
+
+poly fPoly;
+poly gPoly;
+
+fPoly=(16001*c^2*f^2*k^2-16001*c*e*f*k^3+c*f^3*h*k-e*f^2*h*k^2);
+gPoly=(c^3*e*f*h-4*c*e^2*f*h^2);
+gcd(fPoly, gPoly);
+
+fPoly=(c^4*k^2-5*c^3*f*h*k+4*c^2*e*h*k^2+4*c^2*f^2*h^2-4*c*e*f*h^2*k);
+gPoly=(-c^3*f*k^2+c^2*e*k^3+2*c^2*f^2*h*k-2*c*e*f*h*k^2);
+gcd(fPoly, gPoly);
+
+fPoly=(-8001*c^4*e*f*k^6+8001*c^4*f^3*h*k^4+8001*c^3*e^2*k^7+8001*c^3*e*f^2*h*k^5+16001*c^3*f^4*h^2*k^3+16001*c^2*e^2*f*h*k^6-16001*c^2*e*f^3*h^2*k^4);
+gPoly=(16001*c^7*e*h*k^3-15998*c^6*e*f*h^2*k^2-7*c^5*e*f^2*h^3*k-8*c^4*e^2*f*h^3*k^2+4*c^4*e*f^3*h^4+8*c^3*e^3*h^3*k^3+24*c^3*e^2*f^2*h^4*k-24*c^2*e^3*f*h^4*k^2-16*c^2*e^2*f^3*h^5+16*c*e^3*f^2*h^5*k);
+gcd(fPoly, gPoly);
 $
