Changeset 71a4d7 in git for factory/cf_gcd_smallp.cc

Timestamp:

Feb 18, 2013, 5:10:09 PM (11 years ago)

Author:

Oleksandr Motsak <malex984@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

65148c4d2a607796fbd578ae2f3219965019aaae

Parents:

d826a82d3b17fc5f6da647679a15d4f1af7657fdf1becf6c8965f6addf0a63ca09a9418a48c294be

Message:

Merge pull request #264 from mmklee/sync

Sync Master and Spielwiese

File:

• factory/cf_gcd_smallp.cc (modified) (11 diffs)

factory/cf_gcd_smallp.cc

@@ -33 +33 @@
 #include "cfNewtonPolygon.h"
 #include "cf_algorithm.h"
+#include "cf_primes.h"
 
 // iinline helper functions:
@@ -820 +821 @@
         cH= uni_content (H);
       ppH= H/cH;
+      ppH /= Lc (ppH);
       CanonicalForm lcppH= gcdlcAlcB/cH;
-      CanonicalForm ccoF= lcA/lcppH;
-      ccoF /= Lc (ccoF);
-      CanonicalForm ccoG= lcB/lcppH;
-      ccoG /= Lc (ccoG);
+      CanonicalForm ccoF= lcppH/Lc (lcppH);
+      CanonicalForm ccoG= lcppH/Lc (lcppH);
       ppCoF= coF/ccoF;
       ppCoG= coG/ccoG;
@@ -836 +836 @@
           CFList u, v;
           DEBOUTLN (cerr, "ppH before mapDown= " << ppH);
-          ppH /= Lc(ppH);
           ppH= mapDown (ppH, prim_elem, im_prim_elem, alpha, u, v);
           ppCoF= mapDown (ppCoF, prim_elem, im_prim_elem, alpha, u, v);
-          ppCoF= mapDown (ppCoG, prim_elem, im_prim_elem, alpha, u, v);
+          ppCoG= mapDown (ppCoG, prim_elem, im_prim_elem, alpha, u, v);
           DEBOUTLN (cerr, "ppH after mapDown= " << ppH);
           if (compressConvexDense)
@@ -1214 +1213 @@
     {
       if (inextension)
+      {
+        ppA= GFMapDown (ppA, k);
+        ppB= GFMapDown (ppB, k);
         setCharacteristic (p, k, gf_name_buf);
+      }
       coF= N (ppA*(cA/gcdcAcB));
       coG= N (ppB*(cB/gcdcAcB));
@@ -1267 +1270 @@
         cH= uni_content (H);
       ppH= H/cH;
+      ppH /= Lc (ppH);
       CanonicalForm lcppH= gcdlcAlcB/cH;
-      CanonicalForm ccoF= lcA/lcppH;
-      ccoF /= Lc (ccoF);
-      CanonicalForm ccoG= lcB/lcppH;
-      ccoG /= Lc (ccoG);
+      CanonicalForm ccoF= lcppH/Lc (lcppH);
+      CanonicalForm ccoG= lcppH/Lc (lcppH);
       ppCoF= coF/ccoF;
       ppCoG= coG/ccoG;
@@ -1624 +1626 @@
       G_random_element=
       GCD_Fp_extension (ppA (random_element, x), ppB (random_element, x),
-                        coF_random_element, coG_random_element, alpha,
+                        coF_random_element, coG_random_element, V_buf,
                         list, topLevel);
       TIMING_END_AND_PRINT (gcd_recursion,
@@ -3905 +3907 @@
       l.append (random_element);
 
-    if ((getCharacteristic() > 3 && size (skeleton) < 100))
+    if ((getCharacteristic() > 3 && size (skeleton) < 200))
     {
       CFArray Monoms;
@@ -4120 +4122 @@
       } while (1); //end of second do
     }
+    else
+      return N(gcdcAcB*GCD_small_p (ppA, ppB));
   } while (1); //end of first do
 }
@@ -4381 +4385 @@
 
   CFList evaluation;
+  long termEstimate= size (U);
   for (int i= A.min(); i <= A.max(); i++)
+  {
+    if (!A[i].isZero() && (getCharacteristic() > degree (U,i))) //TODO find a good estimate for getCharacteristic() <= degree (U,i)
+    {
+      termEstimate *= degree (U,i)*2;
+      termEstimate /= 3;
+    }
     evaluation.append (A [i]);
+  }
+  if (termEstimate/getNumVars(U) > 500)
+    return -1;
   CFList UEval;
   CanonicalForm shiftedU= myShift2Zero (U, UEval, evaluation);
@@ -4548 +4562 @@
     if( F.mvar() == G.mvar() )
       d *= gcd( F, G );
+    else
+      return N (d);
     return N (d);
+  }
+  if ( F.isUnivariate())
+  {
+    g= content (G,G.mvar());
+    return N(d*gcd(F,g));
+  }
+  if ( G.isUnivariate())
+  {
+    f= content (F,F.mvar());
+    return N(d*gcd(G,f));
   }
 
@@ -4934 +4960 @@
         }
         else
-          return N (d*GCD_small_p (F,G));
+        {
+          if (p >= cf_getBigPrime(0))
+            return N (d*sparseGCDFp (F,G));
+          else
+            return N (d*GCD_small_p (F,G));
+        }
       }