Changeset ce41efa in git


Ignore:
Timestamp:
Jan 22, 2013, 3:47:31 PM (11 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '3720ae8bfcff4a4649ee98a15552089151d2d59b')
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:
2 edited

Legend:

Unmodified
Added
Removed
  • factory/cf_gcd_smallp.cc

    ra60b8b rce41efa  
    43814381
    43824382  CFList evaluation;
     4383  long termEstimate= size (U);
    43834384  for (int i= A.min(); i <= A.max(); i++)
     4385  {
     4386    if (!A[i].isZero())
     4387    {
     4388      termEstimate *= degree (U,i)*2;
     4389      termEstimate /= 3;
     4390    }
    43844391    evaluation.append (A [i]);
     4392  }
     4393  if (termEstimate/getNumVars(U) > 500)
     4394    return -1;
    43854395  CFList UEval;
    43864396  CanonicalForm shiftedU= myShift2Zero (U, UEval, evaluation);
  • factory/fac_ezgcd.cc

    ra60b8b rce41efa  
    296296
    297297  CFList evaluation;
     298  long termEstimate= size (U);
    298299  for (int i= A.min(); i <= A.max(); i++)
     300  {
     301    if (!A[i].isZero())
     302    {
     303      termEstimate *= degree (U,i)*2;
     304      termEstimate /= 3;
     305    }
    299306    evaluation.append (A [i]);
     307  }
     308  if (termEstimate/getNumVars(U) > 500)
     309    return -1;
    300310  CFList UEval;
    301311  CanonicalForm shiftedU= myShift2Zero (U, UEval, evaluation);
     
    425435  int degF, degG, delta, t, count, maxeval;
    426436  REvaluation bt;
    427   bool gcdfound = false;
     437  int gcdfound = 0;
    428438  Variable x = Variable(1);
    429439  count= 0;
Note: See TracChangeset for help on using the changeset viewer.