Changeset c6eecb in git for factory/cf_gcd.cc

Timestamp:

Apr 26, 2007, 10:22:48 AM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

8251cc1c81aab678de3aec185a8de7969e825393

Parents:

cb637fad8051814719a0ea36ed4b65a20f1114cc

Message:

*hannes: avoid NTL char. switches


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

File:

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

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_gcd.cc,v 1.48 2006-09-25 12:33:11 Singular Exp $ */
+/* $Id: cf_gcd.cc,v 1.49 2007-04-26 08:22:48 Singular Exp $ */
 
 #include <config.h>
@@ -125 +125 @@
   && isPurePoly(f) && isPurePoly(g))
   {
-    zz_pContext ccc(getCharacteristic());
-    ccc.restore();
-    zz_p::init(getCharacteristic());
+    if (fac_NTL_char!=getCharacteristic())
+    {
+      fac_NTL_char=getCharacteristic();
+      #ifdef NTL_ZZ
+      ZZ r;
+      r=getCharacteristic();
+      ZZ_pContext ccc(r);
+      #else
+      zz_pContext ccc(getCharacteristic());
+      #endif
+      ccc.restore();
+      #ifdef NTL_ZZ
+      ZZ_p::init(r);
+      #else
+      zz_p::init(getCharacteristic());
+      #endif
+    }
+    #ifdef NTL_ZZ
+    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());
+    #else
     zz_pX F1=convertFacCF2NTLzzpX(f);
     zz_pX G1=convertFacCF2NTLzzpX(g);
@@ -136 +160 @@
     b=convertNTLzzpX2CF(B,f.mvar());
     return convertNTLzzpX2CF(R,f.mvar());
+    #endif
   }
 #endif
@@ -144 +169 @@
   CanonicalForm f0 = 1, f1 = 0, g0 = 0, g1 = 1, q, r;
 
-  while ( ! p1.isZero() ) {
+  while ( ! p1.isZero() )
+  {
       divrem( p0, p1, q, r );
       p0 = p1; p1 = r;
@@ -156 +182 @@
   b = g0 / ( contg * contp0 );
   p0 /= contp0;
-  if ( p0.sign() < 0 ) {
+  if ( p0.sign() < 0 )
+  {
       p0 = -p0;
       a = -a;
@@ -696 +723 @@
 gcd_univar_ntlp( const CanonicalForm & F, const CanonicalForm & G )
 {
+  if (fac_NTL_char!=getCharacteristic())
+  {
+    fac_NTL_char=getCharacteristic();
+    #ifdef NTL_ZZ
+    ZZ r;
+    r=getCharacteristic();
+    ZZ_pContext ccc(r);
+    #else
     zz_pContext ccc(getCharacteristic());
+    #endif
     ccc.restore();
+    #ifdef NTL_ZZ
+    ZZ_p::init(r);
+    #else
     zz_p::init(getCharacteristic());
-    zz_pX F1=convertFacCF2NTLzzpX(F);
-    zz_pX G1=convertFacCF2NTLzzpX(G);
-    zz_pX R=GCD(F1,G1);
-    return  convertNTLzzpX2CF(R,F.mvar());
+    #endif
+  }
+  #ifdef NTL_ZZ
+  ZZ_pX F1=convertFacCF2NTLZZpX(F);
+  ZZ_pX G1=convertFacCF2NTLZZpX(G);
+  ZZ_pX R=GCD(F1,G1);
+  return  convertNTLZZpX2CF(R,F.mvar());
+  #else
+  zz_pX F1=convertFacCF2NTLzzpX(F);
+  zz_pX G1=convertFacCF2NTLzzpX(G);
+  zz_pX R=GCD(F1,G1);
+  return  convertNTLzzpX2CF(R,F.mvar());
+  #endif
 }