Changeset 64b824 in git


Ignore:
Timestamp:
Feb 10, 2012, 12:10:28 PM (11 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
e016ba74132ef655a25823cf0f343ce4b9069f7d
Parents:
c0851051c3f2502093559a89e463f364c0816aa0
git-author:
Martin Lee <martinlee84@web.de>2012-02-10 12:10:28+01:00
git-committer:
Martin Lee <martinlee84@web.de>2012-04-04 14:42:25+02:00
Message:
chg: threshold for use of LucksWangHeuristic
Location:
factory
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • factory/facFactorize.cc

    rc08510 r64b824  
    451451
    452452    bool success= false;
    453     if (LucksWangSparseHeuristic (oldSqrfPartF*power (LC1, factors.length()-1),
     453    CanonicalForm oldSqrfPartFPowLC= oldSqrfPartF*power(LC1,factors.length()-1);
     454    if (size (oldSqrfPartFPowLC)/getNumVars (oldSqrfPartFPowLC) < 500 &&
     455        LucksWangSparseHeuristic (oldSqrfPartFPowLC,
    454456                                  oldFactors, 1, leadingCoeffs, factors))
    455457    {
    … …  
    884886  A /= hh;
    885887
    886   /*if (LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level() - 3],
    887       factors))
     888  if (size (A)/getNumVars (A) < 500 &&
     889      LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level() - 3],
     890                                factors))
    888891  {
    889892    int check= factors.length();
    … …  
    899902    else
    900903      factors= CFList();
    901   }*/
     904  }
    902905
    903906

  • factory/facFqFactorize.cc

    rc08510 r64b824  
    16281628
    16291629    bool success= false;
    1630     if (LucksWangSparseHeuristic (oldSqrfPartF*power (LC1, factors.length()-1),
     1630    CanonicalForm oldSqrfPartFPowLC= oldSqrfPartF*power(LC1,factors.length()-1);
     1631    if (size (oldSqrfPartFPowLC)/getNumVars (oldSqrfPartFPowLC) < 500 &&
     1632        LucksWangSparseHeuristic (oldSqrfPartFPowLC,
    16311633                                  oldFactors, 1, leadingCoeffs, factors))
    16321634    {
    … …  
    26072609  A /= hh;
    26082610
    2609   if (LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level() - 3],
    2610       factors))
     2611  if (size (A)/getNumVars (A) < 500 &&
     2612      LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level() - 3],
     2613                                factors))
    26112614  {
    26122615    int check= factors.length();
Note: See TracChangeset for help on using the changeset viewer.