Changeset c30347 in git

Timestamp:

Dec 19, 2007, 3:27:14 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

5a01219e1920f1b747aebaf636aa8c5b8f61b714

Parents:

1758fb8f662065e47c332dbd6c4688e8a2dd973c

Message:

*hannes: some other gcd strat


git-svn-id: file:///usr/local/Singular/svn/trunk@10482 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/cf_gcd.cc (modified) (12 diffs)

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_gcd.cc,v 1.57 2007-12-07 11:26:57 Singular Exp $ */
+/* $Id: cf_gcd.cc,v 1.58 2007-12-19 14:27:14 Singular Exp $ */
 
 #include <config.h>
@@ -89 +89 @@
 icontent ( const CanonicalForm & f, const CanonicalForm & c )
 {
-    if ( f.inCoeffDomain() )
-        return gcd( f, c );
-    else {
+    if ( f.inBaseDomain() )
+    {
+      if (c.isZero()) return abs(f);
+      return bgcd( f, c );
+    }
+    else if ( f.inCoeffDomain() )
+       return gcd(f,c);
+    else
+    {
         CanonicalForm g = c;
         for ( CFIterator i = f; i.hasTerms() && ! g.isOne(); i++ )
@@ -469 +475 @@
   int mp, cc, p1, pe;
   mp = f.level()+1;
+#if 0
+  if (( getCharacteristic() == 0 )
+  && (f.level() >4)
+  && (g.level() >4)
+  && isOn( SW_USE_CHINREM_GCD)
+  && (!f.isUnivariate())
+  && (!g.isUnivariate())
+  && (isPurePoly_m(f))
+  && (isPurePoly_m(g))
+  )
+  {
+      return chinrem_gcd( f, g );
+  }
+#endif
   cf_prepgcd( f, g, cc, p1, pe);
   if ( cc != 0 )
@@ -490 +510 @@
       return d1;
   bool fc_isUnivariate=fc.isUnivariate();
+  bool fc_and_gc_Univariate=fc_isUnivariate && gc.isUnivariate();
   if ( getCharacteristic() != 0 )
   {
-    if (isOn( SW_USE_EZGCD_P ) && (!fc_isUnivariate))
+    if (isOn( SW_USE_EZGCD_P ) && (!fc_and_gc_Univariate))
     {
       if ( pe == 1 )
@@ -509 +530 @@
         fc = swapvar( fin_ezgcd( fc, gc ), Variable(1), Variable(pe) );
       }
-    } 
+    }
     else if (isOn(SW_USE_GCD_P))
     {
@@ -523 +544 @@
     }
   }
-  else if (!fc_isUnivariate)
-  {
+  else if (!fc_and_gc_Univariate)
+  {
+    if (
+    isOn(SW_USE_CHINREM_GCD)
+    && (gc.level() >5)
+    && (fc.level() >5)
+    && (isPurePoly_m(fc)) && (isPurePoly_m(gc))
+    )
+    {
+    #if 0
+      if ( p1 == fc.level() )
+        fc = chinrem_gcd( fc, gc );
+      else
+      {
+        fc = replacevar( fc, Variable(p1), Variable(mp) );
+        gc = replacevar( gc, Variable(p1), Variable(mp) );
+        fc = replacevar( chinrem_gcd( fc, gc ), Variable(mp), Variable(p1) );
+      }
+    #else
+      fc = chinrem_gcd( fc, gc);
+    #endif
+    }
     if ( isOn( SW_USE_EZGCD ) )
     {
@@ -545 +586 @@
     else if (
     isOn(SW_USE_CHINREM_GCD)
-    && (!gc.isUnivariate())
     && (isPurePoly_m(fc)) && (isPurePoly_m(gc))
     )
@@ -561 +601 @@
       fc = chinrem_gcd( fc, gc);
     #endif
+    }
+    else
+    {
+       fc = gcd_poly_0( fc, gc );
     }
   }
@@ -1040 +1084 @@
       i--;
     }
+    //printf("try p=%d\n",p);
     setCharacteristic( p );
-    Dp = gcd( mapinto( f ), mapinto( g ) );
+    Dp = gcd_poly( mapinto( f ), mapinto( g ) );
     Dp /=Dp.lc();
     setCharacteristic( 0 );
     dp_deg=totaldegree(Dp);
     if ( dp_deg == 0 )
+    {
+      //printf(" -> 1\n");
       return CanonicalForm(1);
+    }
     if ( q.isZero() )
     {
@@ -1063 +1111 @@
       else if ( dp_deg < d_deg )
       {
+        //printf(" were all bad, try more\n");
         // all previous p's are bad primes
         q = p;
         D = mapinto( Dp );
         d_deg=dp_deg;
+      }
+      else
+      {
+        //printf(" was bad, try more\n");
       }
       //else dp_deg > d_deg: bad prime
@@ -1081 +1134 @@
       if ( fdivides( Dn, f ) && fdivides( Dn, g ) )
       {
+        //printf(" -> success\n");
         return Dn;
       }
@@ -1087 +1141 @@
     else
     { // try other method
+      //printf("try other gcd\n");
       Off(SW_USE_CHINREM_GCD);
       D=gcd_poly( f, g );