Changeset 9dacf3f in git


Ignore:
Timestamp:
Aug 8, 2012, 2:34:36 PM (10 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '96ce329119711a2b80858c8365abd29f8460bbfa')
Children:
c8fff028ddb550795f277e7196e8d33b61b3e020
Parents:
fce807dd867479a3c2e3030b73a57dbe28db63c6
git-author:
Martin Lee <martinlee84@web.de>2012-08-08 14:34:36+02:00
git-committer:
Martin Lee <martinlee84@web.de>2012-09-04 18:01:16+02:00
Message:
fix: more fixes to precomputeLeadingCoeff
Location:
factory
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • factory/facFactorize.cc

    rfce807 r9dacf3f  
    184184  CanonicalForm test= evalSqrfPartF.getFirst() (evalPoint[0], 2);
    185185
    186   if (degree (test) != degree (sqrfPartF, 1))
     186  if (degree (test) != degree (sqrfPartF, 1) || test.inCoeffDomain())
    187187    return 0;
    188188
     
    325325  CFArray swap= CFArray (evaluation.length());
    326326  CFListIterator iter= evaluation;
    327   CanonicalForm vars=getVars (LCF);
     327  CanonicalForm vars=getVars (LCF)*Variable (2);
    328328  for (int i= evaluation.length() +1; i > 1; i--, iter++)
    329329  {
     
    376376        for (int k= 0; k < evaluation.length()-1; k++)
    377377        {
    378           if (k+1 != lev)
     378          if (N (Variable (k+1)).level() != y.level())
    379379            evalPoint[k]= buf[k+1];
    380380          else
  • factory/facFqFactorize.cc

    rfce807 r9dacf3f  
    13551355  CanonicalForm test= evalSqrfPartF.getFirst() (evalPoint[0], 2);
    13561356
    1357   if (degree (test) != degree (sqrfPartF, 1))
     1357  if (degree (test) != degree (sqrfPartF, 1) || test.inCoeffDomain())
    13581358    return 0;
    13591359
     
    14971497  CFArray swap= CFArray (evaluation.length());
    14981498  CFListIterator iter= evaluation;
    1499   CanonicalForm vars=getVars (LCF);
     1499  CanonicalForm vars=getVars (LCF)*Variable (2);
    15001500  for (int i= evaluation.length() +1; i > 1; i--, iter++)
    15011501  {
     
    15471547        for (int k= 0; k < evaluation.length()-1; k++)
    15481548        {
    1549           if (k+1 != lev)
     1549          if (N (Variable (k+1)).level() != y.level())
    15501550            evalPoint[k]= buf[k+1];
    15511551          else
Note: See TracChangeset for help on using the changeset viewer.