Changeset 3ef0a0 in git


Ignore:
Timestamp:
Jun 20, 2012, 11:07:20 AM (11 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
Children:
04cda6a6e7c54cffb526576f62140396a6cc5968
Parents:
eca69d4cc744be10bc6ca1e28244971391756e97
git-author:
Martin Lee <martinlee84@web.de>2012-06-20 11:07:20+02:00
git-committer:
Martin Lee <martinlee84@web.de>2012-07-31 11:49:29+02:00
Message:
chg: fewer univariate factorizations if input is symmetric
File:
1 edited

Legend:

Unmodified
Added
Removed
  • factory/facFqBivar.cc

    reca69d r3ef0a0  
    60346034    bufAeval= A;
    60356035    bufEvaluation= evalPoint (A, bufAeval, alpha, list, GF, fail);
    6036     if (!derivXZero && !fail2)
     6036    if (!derivXZero && !fail2 && !symmetric)
    60376037    {
    60386038      if (i == 0)
     
    60476047    if (fail && (i == 0))
    60486048    {
    6049       if (!derivXZero && !fail2)
     6049      if (!derivXZero && !fail2 && !symmetric)
    60506050      {
    60516051        bufEvaluation= bufEvaluation2;
     
    60876087              (prod (bufUniFactors)*Lc (bufAeval) == bufAeval));
    60886088
    6089     if (!derivXZero && !fail2)
     6089    if (!derivXZero && !fail2 && !symmetric)
    60906090    {
    60916091      TIMING_START (fac_fq_uni_factorizer);
     
    60986098
    60996099    if (bufUniFactors.length() == 1 ||
    6100         (!fail2 && !derivXZero && (bufUniFactors2.length() == 1)))
     6100        (!fail2 && !derivXZero && !symmetric && (bufUniFactors2.length() == 1)))
    61016101    {
    61026102      if (extension)
     
    61366136      }
    61376137
    6138       if (!derivXZero && !fail2 && subCheck2 > 0)
     6138      if (!derivXZero && !fail2 && !symmetric && subCheck2 > 0)
    61396139      {
    61406140        int subCheck= substituteCheck (bufUniFactors2);
     
    61566156    // degree analysis
    61576157    bufDegs = DegreePattern (bufUniFactors);
    6158     if (!derivXZero && !fail2)
     6158    if (!derivXZero && !fail2 && !symmetric)
    61596159      bufDegs2= DegreePattern (bufUniFactors2);
    61606160
     
    61656165      uniFactors= bufUniFactors;
    61666166      degs= bufDegs;
    6167       if (!derivXZero && !fail2)
     6167      if (!derivXZero && !fail2 && !symmetric)
    61686168      {
    61696169        Aeval2= bufAeval2;
     
    61766176    {
    61776177      degs.intersect (bufDegs);
    6178       if (!derivXZero && !fail2)
     6178      if (!derivXZero && !fail2 && !symmetric)
    61796179      {
    61806180        degs2.intersect (bufDegs2);
     
    61946194    }
    61956195    list.append (bufEvaluation);
    6196     if (!derivXZero && !fail2)
     6196    if (!derivXZero && !fail2 && !symmetric)
    61976197      list2.append (bufEvaluation2);
    61986198  }
    61996199
    6200   if (!derivXZero && !fail2)
     6200  if (!derivXZero && !fail2 && !symmetric)
    62016201  {
    62026202    if (uniFactors.length() > uniFactors2.length() ||
Note: See TracChangeset for help on using the changeset viewer.