Changeset fda36e in git

Timestamp:

May 8, 2006, 2:24:04 PM (17 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

fa98a4f5c478760aa9bbf122228fe2c21c16173c

Parents:

8492cb96ea713816ff1376eb6195c8eaa8b76c45

Message:

NTL like Singular


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

File:

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

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_gcd.cc,v 1.45 2006-04-27 14:32:57 Singular Exp $ */
+/* $Id: cf_gcd.cc,v 1.46 2006-05-08 12:24:04 pohl Exp $ */
 
 #include <config.h>
@@ -286 +286 @@
     CanonicalForm pi, pi1;
     CanonicalForm C, Ci, Ci1, Hi, bi, pi2;
+    bool bpure;
     int delta = degree( f ) - degree( g );
 
@@ -301 +302 @@
     if ( !( pi.isUnivariate() && pi1.isUnivariate() ) )
     {
-      if ( gcd_test_one( pi1, pi, true ) )
-        return C;
-    }
+        if ( gcd_test_one( pi1, pi, true ) )
+            return C;
+        bpure = false;
+      
+    }
+    else
+    {
+        bpure = isPurePoly(pi) && isPurePoly(pi1);
 #ifdef HAVE_NTL
-    else
-    {
-      if ( isOn(SW_USE_NTL_GCD_P) && isPurePoly(pi) && isPurePoly(pi1) )
-        return gcd_univar_ntlp(pi, pi1 ) * C;
-    }
+        if ( isOn(SW_USE_NTL_GCD_P) && bpure )
+            return gcd_univar_ntlp(pi, pi1 ) * C;
 #endif
+    }
     Variable v = f.mvar();
     Hi = power( LC( pi1, v ), delta );
@@ -332 +336 @@
     if ( degree( pi1, v ) == 0 )
         return C;
-    else
-        return C * pp( pi );
+    pi /= content( pi );
+    if ( bpure )
+        pi /= pi.lc();
+    return C * pi;
 }