Changeset ce41efa in git

Timestamp:

Jan 22, 2013, 3:47:31 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

b770bfdbb226b2a3128f6e2799e672f60ee9be55

Parents:

a60b8bed450e0ed0680beff9febf2b8c0daf5140

git-author:

Martin Lee <martinlee84@web.de>2013-01-22 15:47:31+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-02-18 15:13:02+01:00

Message:

chg: estimate term growth through shifting evaluation point in ezgcd
fix: stupid bug in ezgcd

Location:

factory

Files:

• cf_gcd_smallp.cc (modified) (1 diff)
• fac_ezgcd.cc (modified) (2 diffs)

factory/cf_gcd_smallp.cc

@@ -4381 +4381 @@
 
   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);

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;