Changeset ec664a2 in git


Ignore:
Timestamp:
Jul 31, 2012, 11:45:53 AM (10 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '96ce329119711a2b80858c8365abd29f8460bbfa')
Children:
773d281c087d1388ff04cd6c70faccb93fe0fc03
Parents:
3ed675898c2676dd8ccc1bcc862fa6d6b80b234e
Message:
fix: compilation errors with --enable-timing
File:
1 edited

Legend:

Unmodified
Added
Removed
  • factory/facFactorize.cc

    r3ed6758 rec664a2  
    2929#include "facSparseHensel.h"
    3030
    31 TIMING_DEFINE_PRINT(bi_factorize)
    32 TIMING_DEFINE_PRINT(hensel_lift)
    33 TIMING_DEFINE_PRINT(factor_recombination)
     31TIMING_DEFINE_PRINT(fac_bi_factorize)
     32TIMING_DEFINE_PRINT(fac_hensel_lift)
     33TIMING_DEFINE_PRINT(fac_factor_recombination)
    3434
    3535#ifdef HAVE_NTL
     
    715715    bufLift= degree (A, y) + 1 + degree (LC(A, x), y);
    716716
    717     TIMING_START (bi_factorize);
     717    TIMING_START (fac_bi_factorize);
    718718    bufBiFactors= ratBiSqrfFactorize (bufAeval.getFirst(), v);
    719     TIMING_END_AND_PRINT (bi_factorize,
     719    TIMING_END_AND_PRINT (fac_bi_factorize,
    720720                          "time for bivariate factorization: ");
    721721    bufBiFactors.removeFirst();
     
    995995    ExtensionInfo info= ExtensionInfo (false);
    996996    CFList liftedFactors;
    997     TIMING_START (hensel_lift);
     997    TIMING_START (fac_hensel_lift);
    998998    liftedFactors= henselLiftAndEarly
    999999                   (A, MOD, liftBounds, earlySuccess, earlyFactors,
    10001000                    Aeval, biFactors, evaluation, info);
    1001     TIMING_END_AND_PRINT (hensel_lift, "time for hensel lifting: ");
    1002 
    1003     TIMING_START (factor_recombination);
     1001    TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
     1002
     1003    TIMING_START (fac_factor_recombination);
    10041004    factors= factorRecombination (A, liftedFactors, MOD);
    1005     TIMING_END_AND_PRINT (factor_recombination,
     1005    TIMING_END_AND_PRINT (fac_factor_recombination,
    10061006                          "time for factor recombination: ");
    10071007
Note: See TracChangeset for help on using the changeset viewer.