Changeset a209e1d in git for factory/facFqBivar.cc


Ignore:
Timestamp:
Nov 16, 2012, 5:32:59 PM (11 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
bffe62d52befbed8110ddaf99bd0d711e101f9d4
Parents:
f3bd4cf51acbd4ce841f52698b25e2b56e561b5d
git-author:
Martin Lee <martinlee84@web.de>2012-11-16 17:32:59+01:00
git-committer:
Martin Lee <martinlee84@web.de>2012-11-16 18:58:45+01:00
Message:
fix: make sure factors are lifted high enough to apply naive recombination
File:
1 edited

Legend:

Unmodified
Added
Removed

  • factory/facFqBivar.cc

    rf3bd4c ra209e1d  
    23502350  }
    23512351  delete [] A;
     2352  if (!wasInBounds)
     2353  {
     2354    if (start)
     2355      henselLiftResume12 (F, factors, start, degree (F) + 1, Pi, diophant, M);
     2356    else
     2357      henselLift12 (F, factors, degree (F) + 1, Pi, diophant, M);
     2358    factors.insert (LCF);
     2359  }
    23522360  return l;
    23532361}
    … …  
    24722480  }
    24732481  delete [] A;
     2482  if (!wasInBounds)
     2483  {
     2484    if (start)
     2485      henselLiftResume12 (F, factors, start, degree (F) + 1, Pi, diophant, M);
     2486    else
     2487      henselLift12 (F, factors, degree (F) + 1, Pi, diophant, M);
     2488    factors.insert (LCF);
     2489  }
    24742490  return l;
    24752491}
    … …  
    26522668  }
    26532669  delete [] A;
     2670  if (!wasInBounds)
     2671  {
     2672    if (start)
     2673      henselLiftResume12 (F, factors, start, degree (F) + 1, Pi, diophant, M);
     2674    else
     2675      henselLift12 (F, factors, degree (F) + 1, Pi, diophant, M);
     2676    factors.insert (LCF);
     2677  }
    26542678  return l;
    26552679}
    … …  
    28512875  }
    28522876  delete [] A;
     2877  if (!wasInBounds)
     2878  {
     2879    if (start)
     2880      henselLiftResume12 (F, factors, start, degree (F) + 1, Pi, diophant, M);
     2881    else
     2882      henselLift12 (F, factors, degree (F) + 1, Pi, diophant, M);
     2883    factors.insert (LCF);
     2884  }
    28532885  return l;
    28542886}
    … …  
    29703002  }
    29713003  delete [] A;
     3004  if (!wasInBounds)
     3005  {
     3006    if (start)
     3007      henselLiftResume12 (F, factors, start, degree (F) + 1, Pi, diophant, M);
     3008    else
     3009      henselLift12 (F, factors, degree (F) + 1, Pi, diophant, M);
     3010    factors.insert (LCF);
     3011  }
    29723012  return l;
    29733013}
    … …  
    31373177  }
    31383178  delete [] A;
     3179  if (!wasInBounds)
     3180  {
     3181    if (start)
     3182      henselLiftResume12 (F, factors, start, degree (F) + 1, Pi, diophant, M);
     3183    else
     3184      henselLift12 (F, factors, degree (F) + 1, Pi, diophant, M);
     3185    factors.insert (LCF);
     3186  }
    31393187  return l;
    31403188}
    … …  
    62706318    return Union (smallFactors,
    62716319                  factorRecombination (bufUniFactors, F,
    6272                                        power (y, degree (F) + 1 + degree (LCF)),
     6320                                       power (y, degree (F) + 1),
    62736321                                       degs, 1, bufUniFactors.length()/2
    62746322                                      )
Note: See TracChangeset for help on using the changeset viewer.