Changeset 41e77d in git


Ignore:
Timestamp:
Aug 23, 2012, 3:55:40 PM (10 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')
Children:
0facdca6b24379ab6fa4c490c0c6105b9f0e8c45
Parents:
903f87563d5c7fb02893c3f85c6e728757b7106b
git-author:
Martin Lee <martinlee84@web.de>2012-08-23 15:55:40+02:00
git-committer:
Martin Lee <martinlee84@web.de>2012-09-04 18:01:19+02:00
Message:
fix: minor bug in precomputeLeadingCoeff
chg: normalize only if necessary
Location:
factory
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • factory/facFactorize.cc

    r903f87 r41e77d  
    323323      result.insert (Lc (LCF));
    324324    else
    325       result.append (LCF);
     325    {
     326      for (CFListIterator i= result; i.hasItem(); i++)
     327        i.getItem() *= LCF;
     328      result.insert (LCF);
     329    }
    326330    return result;
    327331  }
    … …  
    13091313      && fdivides (getVars (LCmultiplier), testVars))
    13101314  {
     1315    LCheuristic= true;
    13111316    int index;
    13121317    Variable xx;

  • factory/facFqFactorize.cc

    r903f87 r41e77d  
    14391439      result.insert (Lc (LCF));
    14401440    else
    1441       result.append (LCF);
     1441    {
     1442      for (CFListIterator i= result; i.hasItem(); i++)
     1443        i.getItem() *= LCF;
     1444      result.insert (LCF);
     1445    }
    14421446    return result;
    14431447  }
    … …  
    22182222    }
    22192223    decompress (contentAFactors, N);
    2220     normalize (contentAFactors);
     2224    if (!extension)
     2225      normalize (contentAFactors);
    22212226    return contentAFactors;
    22222227  }
    … …  
    22672272               multiFactorize (gcdDerivZ, info));
    22682273        appendSwapDecompress (factorsG, contentAFactors, N, swapLevel, x);
    2269         normalize (factorsG);
     2274        if (!extension)
     2275          normalize (factorsG);
    22702276        return factorsG;
    22712277      }
    … …  
    23332339                 multiFactorize (A/g, info));
    23342340          appendSwapDecompress (factorsG, contentAFactors, N, swapLevel, x);
    2335           normalize (factorsG);
     2341          if (!extension)
     2342            normalize (factorsG);
    23362343          delete [] bufAeval2;
    23372344          delete [] Aeval2;
    … …  
    23802387      appendSwapDecompress (factors, contentAFactors, N, swapLevel,
    23812388                            swapLevel2, x);
    2382       normalize (factors);
     2389      if (!extension)
     2390        normalize (factors);
    23832391      delete [] bufAeval2;
    23842392      delete [] Aeval2;
    … …  
    24352443    appendSwapDecompress (factors, contentAFactors, N, swapLevel,
    24362444                          swapLevel2, x);
    2437     normalize (factors);
     2445    if (!extension)
     2446      normalize (factors);
    24382447    delete [] Aeval2;
    24392448    return factors;
    … …  
    24682477        appendSwapDecompress (factors, contentAFactors, N, swapLevel,
    24692478                              swapLevel2, x);
    2470         normalize (factors);
     2479        if (!extension)
     2480          normalize (factors);
    24712481        delete [] Aeval2;
    24722482        return factors;
    … …  
    26142624      appendSwapDecompress (factors, contentAFactors, N, swapLevel,
    26152625                            swapLevel2, x);
    2616       normalize (factors);
     2626      if (!extension)
     2627        normalize (factors);
    26172628      delete [] index;
    26182629      delete [] Aeval2;
    … …  
    29592970      && fdivides (getVars (LCmultiplier), testVars))
    29602971  {
     2972    LCheuristic= true;
    29612973    int index;
    29622974    Variable xx;
    … …  
    32343246  append (factors, contentAFactors);
    32353247  decompress (factors, N);
    3236   normalize (factors);
     3248  if (!extension)
     3249    normalize (factors);
    32373250
    32383251  delete[] liftBounds;
Note: See TracChangeset for help on using the changeset viewer.