Changeset 12f992 in git for factory/cf_gcd.cc

Timestamp:

Mar 10, 2014, 2:58:13 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'ec94ef7a30b928574c0c3daf41f6804dff5f6b69')

Children:

b8f562019d20b1ae9a24693975ad6c264a8fa5e9

Parents:

c78743104173a106f27611fdf3b220e3b470d84e

git-author:

Martin Lee <martinlee84@web.de>2014-03-10 14:58:13+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-03-11 11:06:27+01:00

Message:

chg: deleted SW_USE_NTL_GCD_*

File:

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

factory/cf_gcd.cc

@@ -336 +336 @@
   }
 #else
-  if (isOn(SW_USE_NTL_GCD_P) && ( getCharacteristic() > 0 ) && (CFFactory::gettype() != GaloisFieldDomain)
+  if (( getCharacteristic() > 0 ) && (CFFactory::gettype() != GaloisFieldDomain)
   &&  (f.level()==g.level()) && isPurePoly(f) && isPurePoly(g))
   {
@@ -377 +377 @@
   }
 #else
-  if (isOn(SW_USE_NTL_GCD_0) && ( getCharacteristic() ==0)
+  if (( getCharacteristic() ==0)
   && (f.level()==g.level()) && isPurePoly(f) && isPurePoly(g))
   {
@@ -400 +400 @@
       else
       {
-        Off(SW_USE_NTL_GCD_0);
-        r=extgcd(f,g,a,b);
-        if (isOn(SW_RATIONAL))
-        {
-          a/=r.lc();
-          b/=r.lc();
-          r/=r.lc();
-        }
-        On(SW_USE_NTL_GCD_0);
+        F1 /= R;
+        G1 /= R;
+        XGCD (RR, A,B,F1,G1,1);
+        rr=convertZZ2CF(RR);
+        a=convertNTLZZX2CF(A,f.mvar())*(fc/rr);
+        b=convertNTLZZX2CF(B,f.mvar())*(gc/rr);
       }
     }
@@ -422 +419 @@
       else
       {
-        Off(SW_USE_NTL_GCD_0);
-        r=extgcd(f,g,a,b);
-        if (isOn(SW_RATIONAL))
-        {
-          a/=r.lc();
-          b/=r.lc();
-          r/=r.lc();
-        }
-        On(SW_USE_NTL_GCD_0);
+        F1 /= R;
+        G1 /= R;
+        XGCD (RR, A,B,F1,G1,1);
+        rr=convertZZ2CF(RR);
+        a=convertNTLZZX2CF(A,f.mvar())*(fc/rr);
+        b=convertNTLZZX2CF(B,f.mvar())*(gc/rr);
       }
       return r;
@@ -675 +669 @@
 #else
 #ifdef HAVE_NTL
-        if ( isOn(SW_USE_NTL_GCD_P) && bpure && (CFFactory::gettype() != GaloisFieldDomain))
+        if (bpure && (CFFactory::gettype() != GaloisFieldDomain))
             return gcd_univar_ntlp(pi, pi1 ) * C;
 #endif
@@ -794 +788 @@
 #else
 #ifdef HAVE_NTL
-        if ( isOn(SW_USE_NTL_GCD_0) && isPurePoly(pi) && isPurePoly(pi1) )
+        if (isPurePoly(pi) && isPurePoly(pi1) )
             return gcd_univar_ntl0(pi, pi1 ) * C;
 #endif