Changeset abfc3b in git

Timestamp:

Feb 20, 2006, 4:00:59 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0b6919074bf78beca9b3294f6190ca7c2ff35518

Parents:

4c80eb75301d34b598b209761a9ebbb6273460c5

Message:

*hannes: gcd_poly


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

File:

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

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_gcd.cc,v 1.39 2006-02-17 11:28:43 Singular Exp $ */
+/* $Id: cf_gcd.cc,v 1.40 2006-02-20 15:00:59 Singular Exp $ */
 
 #include <config.h>
@@ -24 +24 @@
 #endif
 
-static CanonicalForm gcd_poly( const CanonicalForm & f, const CanonicalForm& g, bool modularflag );
+static CanonicalForm gcd_poly( const CanonicalForm & f, const CanonicalForm& g, const bool modularflag );
 static CanonicalForm cf_content ( const CanonicalForm & f, const CanonicalForm & g );
 
@@ -118 +118 @@
 }
 //}}}
-
-//{{{ static CanonicalForm bcontent ( const CanonicalForm & f, const CanonicalForm & b )
-//{{{ docu
-//
-// bcontent() - return gcd of b and all coefficients of f which
-//   are in a basic domain.
-//
-// Used by gcd().
-//
-//}}}
-static CanonicalForm
-bcontent ( const CanonicalForm & f, const CanonicalForm & c )
-{
-    if ( f.inBaseDomain() )
-        return bgcd( f, c );
-    else if ( f.inCoeffDomain() )
-        return f.genOne();
-    else {
-        CanonicalForm g = c;
-        for ( CFIterator i = f; i.hasTerms() && ! g.isOne(); i++ )
-            g = bcontent( i.coeff(), g );
-        if( g.lc().sign() < 0 )
-            return -g;
-        else
-            return g;
-    }
-}
-//}}}
-
 
 //{{{ CanonicalForm icontent ( const CanonicalForm & f )
@@ -357 +328 @@
 
 CanonicalForm
-gcd_poly1( const CanonicalForm & f, const CanonicalForm & g, bool modularflag )
+gcd_poly1( const CanonicalForm & f, const CanonicalForm & g, const bool modularflag )
 {
     CanonicalForm pi, pi1;
@@ -431 +402 @@
 int si_factor_reminder=1;
 static CanonicalForm
-gcd_poly ( const CanonicalForm & f, const CanonicalForm & g, bool modularflag )
-{
-    if ( getCharacteristic() != 0 ) {
-        if (! ( f.isUnivariate() && g.isUnivariate() ) ) {
-            CFMap M, N;
-            compress( f, g, M, N );
-            CanonicalForm fM = M(f);
-            CanonicalForm gM = M(g);
-            if ( fM.mvar() != gM.mvar() ) {
-                if ( fM.mvar() > gM.mvar() )
-                    return N( cf_content( fM, gM ) );
-                else
-                    return N( cf_content( gM, fM ) );
-            }
-            else
-                return N( gcd_poly1( fM, gM, false ) );
-        }
-        else
-            return gcd_poly1( f, g, false );
-    }
-    else if ( isOn( SW_USE_EZGCD ) && ! ( f.isUnivariate() && g.isUnivariate() ) ) {
+gcd_poly ( const CanonicalForm & f, const CanonicalForm & g, const bool modularflag )
+{
+    if ( getCharacteristic() != 0 )
+    {
+      if ( f.mvar() != g.mvar() )
+      {
+        CFMap M, N;
+        compress( f, g, M, N );
+        CanonicalForm fM = M(f);
+        CanonicalForm gM = M(g);
+        //if ( fM.mvar() != gM.mvar() )
+        //{
+        // 
+        //  if ( fM.mvar() > gM.mvar() )
+        //    return N( cf_content( fM, gM ) );
+        //  else
+        //    return N( cf_content( gM, fM ) );
+        //}
+        //else
+            return N( gcd_poly1( fM, gM, false ) );
+      }
+      else
+        return gcd_poly1( f, g, false );
+    }
+    else if ( isOn( SW_USE_EZGCD ) && ! ( f.isUnivariate() && g.isUnivariate() ) )
+    {
         CFMap M, N;
         compress( f, g, M, N );
@@ -516 +492 @@
     }
     else
-    {
-        ASSERT(g==0,"invalid call of cf_gcd");
         if ( f.sign() < 0 )
             return -f;
         else
             return f;
-    }
 }
 //}}}
@@ -613 +586 @@
 {
     if ( f.isZero() )
-    {
-      if ( g.lc().sign() < 0 )
-        return -g;
-      else
-       return g;
-    }
+        if ( g.lc().sign() < 0 )
+            return -g;
+        else
+            return g;
     else  if ( g.isZero() )
-    {
-      if ( f.lc().sign() < 0 )
-        return -f;
-      else
-        return f;
-    }
+        if ( f.lc().sign() < 0 )
+            return -f;
+        else
+            return f;
     else  if ( f.inBaseDomain() )
-        return bcontent( g, f );
+        if ( g.inBaseDomain() )
+            return bgcd( f, g );
+        else
+            return cf_content( g, f );
     else  if ( g.inBaseDomain() )
-        return bcontent( f, g );
+        return cf_content( f, g );
     else  if ( f.mvar() == g.mvar() )
         if ( f.inExtension() && getReduce( f.mvar() ) )
@@ -652 +624 @@
                 CanonicalForm F = f * l, G = g * l;
                 Off( SW_RATIONAL );
-                do { l = gcd_poly( F, G, true ); 
-                //if ((!divides(l,F)) || (!divides(l,G))) 
-                //{printf("fehler\n"); 
-                //cout<<"F="<<F<<"\nG="<<G<<"wrong gcd="<<l<<"\n";
-                //}
-                }
-                while (0); //((!divides(l,F)) || (!divides(l,G)));
+                do { l = gcd_poly( F, G, true ); }
+                while ((!divides(l,F)) || (!divides(l,G)));
                 On( SW_RATIONAL );
                 if ( l.lc().sign() < 0 )
@@ -667 +634 @@
             else {
                 CanonicalForm d;
-                do{ d = gcd_poly( f, g, getCharacteristic()==0 ); 
-                //if ((!divides(d,f)) || (!divides(d,g)))
-                //{printf("fehler2\n"); cout<<"F="<<f<<"\nG="<<g<<"wrong gcd="<<d<<"\n";
-                //}
-                }
-                while (0);//((!divides(d,f)) || (!divides(d,g)));
+                do{ d = gcd_poly( f, g, getCharacteristic()==0 ); }
+                while ((!divides(d,f)) || (!divides(d,g)));
                 if ( d.lc().sign() < 0 )
                     return -d;