Changeset 71a4d7 in git for factory/fac_ezgcd.cc

Timestamp:

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

Author:

Oleksandr Motsak <malex984@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

65148c4d2a607796fbd578ae2f3219965019aaae

Parents:

d826a82d3b17fc5f6da647679a15d4f1af7657fdf1becf6c8965f6addf0a63ca09a9418a48c294be

Message:

Merge pull request #264 from mmklee/sync

Sync Master and Spielwiese

File:

• factory/fac_ezgcd.cc (modified) (3 diffs)

factory/fac_ezgcd.cc

@@ -296 +296 @@
 
   CFList evaluation;
+  long termEstimate= size (U);
   for (int i= A.min(); i <= A.max(); i++)
+  {
+    if (!A[i].isZero())
+    {
+      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);
@@ -425 +435 @@
   int degF, degG, delta, t, count, maxeval;
   REvaluation bt;
-  bool gcdfound = false;
+  int gcdfound = 0;
   Variable x = Variable(1);
   count= 0;
@@ -470 +480 @@
     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));
   }