Changeset db1996e in git

Timestamp:

Feb 1, 2006, 10:37:07 AM (18 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a9d8e7ac2c2fe540467854824084dc43a02f3b7e

Parents:

893092105917f42eaa276e64daa72cd47ebaccce

Message:

bugfix


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

File:

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

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_gcd.cc,v 1.37 2006-01-31 09:42:23 pohl Exp $ */
+/* $Id: cf_gcd.cc,v 1.38 2006-02-01 09:37:07 pohl Exp $ */
 
 #include <config.h>
@@ -25 +25 @@
 
 static CanonicalForm gcd_poly( const CanonicalForm & f, const CanonicalForm& g, bool modularflag );
+static CanonicalForm cf_content ( const CanonicalForm & f, const CanonicalForm & g );
 
 bool
@@ -430 +431 @@
             CFMap M, N;
             compress( f, g, M, N );
-            return N( gcd_poly1( M(f), M(g), false ) );
+            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