Changeset b1d287 in git for factory/facFactorize.cc


Ignore:
Timestamp:
Aug 1, 2012, 2:25:24 AM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
Children:
0df59c8a8e59eded04e4aca4e57cfed188a00cf1
Parents:
09afeb85ea17e564813761786f76281c8162dad0362fc6799a207ad61d3be8abe0206e52b5782e50
Message:
Merge pull request #157 from mmklee/factory_catch_up_sw

Factory catch up sw
File:
1 edited

Legend:

Unmodified
Added
Removed
  • factory/facFactorize.cc

    r09afeb rb1d287  
    77 *
    88 * @author Martin Lee
    9  *
    10  * @internal @version \$Id$
    119 *
    1210 **/
     
    3129#include "facSparseHensel.h"
    3230
    33 TIMING_DEFINE_PRINT(bi_factorize)
    34 TIMING_DEFINE_PRINT(hensel_lift)
    35 TIMING_DEFINE_PRINT(factor_recombination)
     31TIMING_DEFINE_PRINT(fac_bi_factorize)
     32TIMING_DEFINE_PRINT(fac_hensel_lift)
     33TIMING_DEFINE_PRINT(fac_factor_recombination)
    3634
    3735#ifdef HAVE_NTL
     
    717715    bufLift= degree (A, y) + 1 + degree (LC(A, x), y);
    718716
    719     TIMING_START (bi_factorize);
     717    TIMING_START (fac_bi_factorize);
    720718    bufBiFactors= ratBiSqrfFactorize (bufAeval.getFirst(), v);
    721     TIMING_END_AND_PRINT (bi_factorize,
     719    TIMING_END_AND_PRINT (fac_bi_factorize,
    722720                          "time for bivariate factorization: ");
    723721    bufBiFactors.removeFirst();
     
    997995    ExtensionInfo info= ExtensionInfo (false);
    998996    CFList liftedFactors;
    999     TIMING_START (hensel_lift);
     997    TIMING_START (fac_hensel_lift);
    1000998    liftedFactors= henselLiftAndEarly
    1001999                   (A, MOD, liftBounds, earlySuccess, earlyFactors,
    10021000                    Aeval, biFactors, evaluation, info);
    1003     TIMING_END_AND_PRINT (hensel_lift, "time for hensel lifting: ");
    1004 
    1005     TIMING_START (factor_recombination);
     1001    TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
     1002
     1003    TIMING_START (fac_factor_recombination);
    10061004    factors= factorRecombination (A, liftedFactors, MOD);
    1007     TIMING_END_AND_PRINT (factor_recombination,
     1005    TIMING_END_AND_PRINT (fac_factor_recombination,
    10081006                          "time for factor recombination: ");
    10091007
Note: See TracChangeset for help on using the changeset viewer.