Changeset 7964658 in git

Timestamp:

Oct 19, 2012, 5:24:21 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

d92e665d52071913cbb033cd53653f2c4e85d61f

Parents:

cb4f0c3c5277d6de4d18c968650b4169ff1d1b46

git-author:

Martin Lee <martinlee84@web.de>2012-10-19 17:24:21+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-10-24 12:32:56+02:00

Message:

chg: use modular gcd explicitly in EZ GCD mod p

File:

• factory/cf_gcd_smallp.cc (modified) (1 diff)

factory/cf_gcd_smallp.cc

@@ -4843 +4843 @@
       TIMING_END_AND_PRINT (ez_p_hensel_lift, "time for Hensel lift in EZ_P: ");
 
-      if (gcdfound == -1)
-      {
-        Off (SW_USE_EZGCD_P);
-        result= gcd (F,G);
-        On (SW_USE_EZGCD_P);
-        if (passToGF)
-        {
-          CanonicalForm mipo= gf_mipo;
-          setCharacteristic (p);
-          Variable alpha= rootOf (mipo.mapinto());
-          result= GF2FalphaRep (result, alpha);
+      if (gcdfound == -1) //things became dense
+      {
+        if (algExtension)
+        {
+          result= GCD_Fp_extension (F, G, a);
+          if (extOfExt)
+            result= mapDown (result, primElem, imPrimElem, oldA, dest, source);
+          return N (d*result);
         }
-        if (k > 1)
-        {
-          result= GFMapDown (result, k);
-          setCharacteristic (p, k, gf_name);
+        if (CFFactory::gettype() == GaloisFieldDomain)
+        {
+          result= GCD_GF (F, G);
+          if (passToGF)
+          {
+            CanonicalForm mipo= gf_mipo;
+            setCharacteristic (p);
+            Variable alpha= rootOf (mipo.mapinto());
+            result= GF2FalphaRep (result, alpha);
+          }
+          if (k > 1)
+          {
+            result= GFMapDown (result, k);
+            setCharacteristic (p, k, gf_name);
+          }
+          return N (d*result);
         }
-        if (extOfExt)
-          result= mapDown (result, primElem, imPrimElem, oldA, dest, source);
-        return N (d*result);
+        else
+          return N (d*GCD_small_p (F,G));
       }