Changeset 5b2d2b in git

Timestamp:

Nov 5, 2012, 3:23:36 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

6e88340150f9c8853246d5e107fab8042207d29e

Parents:

2024b69d96cd514f5fac583c96dda89d4e94215c

git-author:

Martin Lee <martinlee84@web.de>2012-11-05 15:23:36+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-11-16 13:16:26+01:00

Message:

fix: gcd_test_one now checks for coprimality over extension
chg: gcd_test_one returns degree of gcd used to check for coprimality

Location:

factory

Files:

• cf_gcd.cc (modified) (5 diffs)
• cf_gcd_smallp.cc (modified) (1 diff)
• fac_ezgcd.cc (modified) (1 diff)
• fac_util.h (modified) (1 diff)

factory/cf_gcd.cc

@@ -45 +45 @@
 
 bool
-gcd_test_one ( const CanonicalForm & f, const CanonicalForm & g, bool swap )
-{
+gcd_test_one ( const CanonicalForm & f, const CanonicalForm & g, bool swap, int & d )
+{
+    d= 0;
     int count = 0;
     // assume polys have same level;
@@ -218 +219 @@
     }
 
-    if ( eval1.taildegree() > 0 && eval2.taildegree() > 0 )
-    {
-        if (passToGF)
-          setCharacteristic (p);
-        if (k > 1)
-          setCharacteristic (p, k, gf_name);
-        return false;
-    }
-
     CanonicalForm c= gcd (eval1, eval2);
-    bool result= c.degree() < 1;
+    d= c.degree();
+    bool result= d < 1;
+    if (d < 0)
+      d= 0;
 
     if (passToGF)
@@ -620 +615 @@
     pi1 = pi1 / Ci1; pi = pi / Ci;
     C = gcd( Ci, Ci1 );
+    int d= 0;
     if ( !( pi.isUnivariate() && pi1.isUnivariate() ) )
     {
-        if ( gcd_test_one( pi1, pi, true ) )
+        if ( gcd_test_one( pi1, pi, true, d ) )
         {
           C=abs(C);
@@ -739 +735 @@
     pi1 = pi1 / Ci1; pi = pi / Ci;
     C = gcd( Ci, Ci1 );
+    int d= 0;
     if ( pi.isUnivariate() && pi1.isUnivariate() )
     {
@@ -752 +749 @@
         return gcd_poly_univar0( pi, pi1, true ) * C;
     }
-    else if ( gcd_test_one( pi1, pi, true ) )
+    else if ( gcd_test_one( pi1, pi, true, d ) )
       return C;
     Variable v = f.mvar();

factory/cf_gcd_smallp.cc

@@ -4547 +4547 @@
   }
 
-  if( gcd_test_one( F, G, false ) )
+  int dummy= 0;
+  if( gcd_test_one( F, G, false, dummy ) )
   {
     return N (d);

factory/fac_ezgcd.cc

@@ -492 +492 @@
   }
 
-  if ( gcd_test_one( F, G, false ) )
+  int dummy= 0;
+  if ( gcd_test_one( F, G, false, dummy ) )
   {
     DEBDECLEVEL( cerr, "ezgcd" );

factory/fac_util.h

@@ -54 +54 @@
 /*ENDPUBLIC*/
 
-bool gcd_test_one ( const CanonicalForm & f, const CanonicalForm & g, bool swap );
+bool gcd_test_one ( const CanonicalForm & f, const CanonicalForm & g, bool swap, int & d );
 
 CanonicalForm ezgcd ( const CanonicalForm & f, const CanonicalForm & g );