Changeset 034eec in git

Timestamp:

Jan 20, 2004, 4:39:52 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

0ae61c6dbdc8ee3e150c56f17b9989cada5fd83c

Parents:

02da1e214204d265d3630b6f20cffc2ee0c7b979

Message:

*hannes:ntl-gcd


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

Location:

factory

Files:

• cf_factor.cc (modified) (2 diffs)
• cf_gcd.cc (modified) (5 diffs)

factory/cf_factor.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_factor.cc,v 1.22 2004-01-19 11:27:46 Singular Exp $ */
+/* $Id: cf_factor.cc,v 1.23 2004-01-20 15:39:52 Singular Exp $ */
 
 //{{{ docu
@@ -160 +160 @@
 #endif
 
-static bool isPurePoly(const CanonicalForm & f)
+bool isPurePoly(const CanonicalForm & f)
 {
   if (f.level()<=0) return false;

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_gcd.cc,v 1.22 2004-01-19 11:26:20 Singular Exp $ */
+/* $Id: cf_gcd.cc,v 1.23 2004-01-20 15:39:52 Singular Exp $ */
 
 #include <config.h>
@@ -19 +19 @@
 
 #ifdef HAVE_NTL
+#include <NTL/ZZX.h>
 #include "NTLconvert.h"
+bool isPurePoly(const CanonicalForm & f);
 #endif
 
@@ -144 +146 @@
 extgcd ( const CanonicalForm & f, const CanonicalForm & g, CanonicalForm & a, CanonicalForm & b )
 {
-    CanonicalForm contf = content( f );
-    CanonicalForm contg = content( g );
-
-    CanonicalForm p0 = f / contf, p1 = g / contg;
-    CanonicalForm f0 = 1, f1 = 0, g0 = 0, g1 = 1, q, r;
-
-    while ( ! p1.isZero() ) {
-        divrem( p0, p1, q, r );
-        p0 = p1; p1 = r;
-        r = g0 - g1 * q;
-        g0 = g1; g1 = r;
-        r = f0 - f1 * q;
-        f0 = f1; f1 = r;
-    }
-    CanonicalForm contp0 = content( p0 );
-    a = f0 / ( contf * contp0 );
-    b = g0 / ( contg * contp0 );
-    p0 /= contp0;
-    if ( p0.sign() < 0 ) {
-        p0 = -p0;
-        a = -a;
-        b = -b;
-    }
-    return p0;
+#ifdef HAVE_NTL
+  if (isOn(SW_USE_NTL_GCD) && ( getCharacteristic() > 0 )
+  && isPurePoly(f) && isPurePoly(g))
+  {
+    zz_pContext ccc(getCharacteristic());
+    ccc.restore();
+    zz_p::init(getCharacteristic());
+    zz_pX F1=convertFacCF2NTLzzpX(f);
+    zz_pX G1=convertFacCF2NTLzzpX(g);
+    zz_pX R;
+    zz_pX A,B;
+    XGCD(R,A,B,F1,G1);
+    a=convertNTLzzpX2CF(A,f.mvar());
+    b=convertNTLzzpX2CF(B,f.mvar());
+    return convertNTLzzpX2CF(R,f.mvar());
+  }
+#endif
+  CanonicalForm contf = content( f );
+  CanonicalForm contg = content( g );
+
+  CanonicalForm p0 = f / contf, p1 = g / contg;
+  CanonicalForm f0 = 1, f1 = 0, g0 = 0, g1 = 1, q, r;
+
+  while ( ! p1.isZero() ) {
+      divrem( p0, p1, q, r );
+      p0 = p1; p1 = r;
+      r = g0 - g1 * q;
+      g0 = g1; g1 = r;
+      r = f0 - f1 * q;
+      f0 = f1; f1 = r;
+  }
+  CanonicalForm contp0 = content( p0 );
+  a = f0 / ( contf * contp0 );
+  b = g0 / ( contg * contp0 );
+  p0 /= contp0;
+  if ( p0.sign() < 0 ) {
+      p0 = -p0;
+      a = -a;
+      b = -b;
+  }
+  return p0;
 }
 //}}}
@@ -175 +194 @@
 {
 #ifdef HAVE_NTL 
-  if (isOn(SW_USE_NTL_GCD))
+  if (isOn(SW_USE_NTL_GCD) && isPurePoly(F) && isPurePoly(G)) 
   {
     if ( getCharacteristic() > 0 )
@@ -295 +314 @@
     C = gcd( Ci, Ci1 );
     pi1 = pi1 / Ci1; pi = pi / Ci;
-    if ( pi.isUnivariate() && pi1.isUnivariate() ) {
-        if ( modularflag )
-            return gcd_poly_univar0( pi, pi1, true ) * C;
-    }
-    else
-        if ( gcd_test_one( pi1, pi, true ) )
-            return C;
+    if ( pi.isUnivariate() && pi1.isUnivariate() )
+    {
+      if ( modularflag
+#ifdef HAVE_NTL
+      || (isOn(SW_USE_NTL_GCD) && isPurePoly(pi) && isPurePoly(pi1))
+#endif
+      )
+        return gcd_poly_univar0( pi, pi1, true ) * C;
+    }
+    else if ( gcd_test_one( pi1, pi, true ) )
+      return C;
     delta = degree( pi, v ) - degree( pi1, v );
     Hi = power( LC( pi1, v ), delta );