Changeset 0b618a7 in git


Ignore:
Timestamp:
Feb 22, 2012, 12:17:07 PM (12 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
43bbd6d912fd61156de899f0e8aa1e830a90b6d7
Parents:
f3a82f4d26a5b3be3272d4081585f856bf75a07c
git-author:
Martin Lee <martinlee84@web.de>2012-02-22 12:17:07+01:00
git-committer:
Martin Lee <martinlee84@web.de>2012-02-22 15:31:05+01:00
Message:
fix: compilation errors with --enable-timing
Location:
factory
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • factory/facBivar.cc

    rf3a82f4 r0b618a7  
    2424
    2525#ifdef HAVE_NTL
    26 TIMING_DEFINE_PRINT(fac_uni_factorizer)
    27 TIMING_DEFINE_PRINT(fac_hensel_lift)
    28 TIMING_DEFINE_PRINT(fac_factor_recombination)
     26TIMING_DEFINE_PRINT(uni_factorize)
     27TIMING_DEFINE_PRINT(hensel_lift12)
    2928
    3029CFList conv (const CFFList& L)
     
    224223
    225224    // univariate factorization
    226     TIMING_START (fac_uni_factorizer);
     225    TIMING_START (uni_factorize);
    227226
    228227    if (extension)
     
    230229    else
    231230      bufUniFactors= conv (factorize (bufAeval, true));
    232     TIMING_END_AND_PRINT (fac_uni_factorizer,
     231    TIMING_END_AND_PRINT (uni_factorize,
    233232                          "time for univariate factorization: ");
    234233    DEBOUTLN (cerr, "Lc (bufAeval)*prod (bufUniFactors)== bufAeval " <<
    235234              (prod (bufUniFactors)*Lc (bufAeval) == bufAeval));
    236235
    237     TIMING_START (fac_uni_factorizer);
     236    TIMING_START (uni_factorize);
    238237    if (extension)
    239238      bufUniFactors2= conv (factorize (bufAeval2, v));
    240239    else
    241240      bufUniFactors2= conv (factorize (bufAeval2, true));
    242     TIMING_END_AND_PRINT (fac_uni_factorizer,
     241    TIMING_END_AND_PRINT (uni_factorize,
    243242                          "time for univariate factorization in y: ");
    244243    DEBOUTLN (cerr, "Lc (Aeval2)*prod (uniFactors2)== Aeval2 " <<
     
    369368  bool earlySuccess= false;
    370369  CFList earlyFactors;
    371   TIMING_START (fac_hensel_lift);
     370  TIMING_START (hensel_lift12);
    372371  uniFactors= henselLiftAndEarly
    373372             (A, earlySuccess, earlyFactors, degs, liftBound,
    374373              uniFactors, dummy, evaluation);
    375   TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
     374  TIMING_END_AND_PRINT (hensel_lift12, "time for hensel lifting: ");
    376375  DEBOUTLN (cerr, "lifted factors= " << uniFactors);
    377376
  • factory/facFactorize.cc

    rf3a82f4 r0b618a7  
    3030#include "cf_reval.h"
    3131#include "facSparseHensel.h"
     32
     33TIMING_DEFINE_PRINT(bi_factorize)
     34TIMING_DEFINE_PRINT(hensel_lift)
     35TIMING_DEFINE_PRINT(factor_recombination)
    3236
    3337#ifdef HAVE_NTL
     
    691695    bufLift= degree (A, y) + 1 + degree (LC(A, x), y);
    692696
    693     TIMING_START (fac_bi_factorizer);
     697    TIMING_START (bi_factorize);
    694698    bufBiFactors= ratBiSqrfFactorize (bufAeval.getFirst(), v);
    695     TIMING_END_AND_PRINT (fac_bi_factorizer,
     699    TIMING_END_AND_PRINT (bi_factorize,
    696700                          "time for bivariate factorization: ");
    697701    bufBiFactors.removeFirst();
     
    969973    CFList earlyFactors;
    970974    ExtensionInfo info= ExtensionInfo (false);
    971     TIMING_START (fac_hensel_lift);
    972     CFList liftedFactors= henselLiftAndEarly
    973                           (A, MOD, liftBounds, earlySuccess, earlyFactors,
    974                            Aeval, biFactors, evaluation, info);
    975     TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
    976 
    977     TIMING_START (fac_factor_recombination);
     975    CFList liftedFactors;
     976    TIMING_START (hensel_lift);
     977    liftedFactors= henselLiftAndEarly
     978                   (A, MOD, liftBounds, earlySuccess, earlyFactors,
     979                    Aeval, biFactors, evaluation, info);
     980    TIMING_END_AND_PRINT (hensel_lift, "time for hensel lifting: ");
     981
     982    TIMING_START (factor_recombination);
    978983    factors= factorRecombination (A, liftedFactors, MOD);
    979     TIMING_END_AND_PRINT (fac_factor_recombination,
     984    TIMING_END_AND_PRINT (factor_recombination,
    980985                          "time for factor recombination: ");
    981986
  • factory/facFqBivar.cc

    rf3a82f4 r0b618a7  
    4040
    4141TIMING_DEFINE_PRINT(fac_uni_factorizer)
    42 TIMING_DEFINE_PRINT(fac_hensel_lift)
    43 TIMING_DEFINE_PRINT(fac_factor_recombination)
     42TIMING_DEFINE_PRINT(fac_hensel_lift12)
    4443
    4544CanonicalForm prodMod0 (const CFList& L, const CanonicalForm& M)
     
    57545753    bool earlySuccess= false;
    57555754    CFList earlyFactors;
    5756     TIMING_START (fac_hensel_lift);
     5755    TIMING_START (fac_hensel_lift12);
    57575756    uniFactors= henselLiftAndEarly
    57585757               (A, earlySuccess, earlyFactors, degs, liftBound,
    57595758                uniFactors, info, evaluation);
    5760     TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
     5759    TIMING_END_AND_PRINT (fac_hensel_lift12, "time for hensel lifting: ");
    57615760    DEBOUTLN (cerr, "lifted factors= " << uniFactors);
    57625761
     
    57775776  else if (degree (A) > 4 && beta.level() == 1 && (2*minBound)/degMipo < 32)
    57785777  {
    5779     TIMING_START (fac_hensel_lift);
     5778    TIMING_START (fac_hensel_lift12);
    57805779    if (extension)
    57815780    {
     
    57955794      factors= Union (lll, factors);
    57965795    }
    5797     TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
     5796    TIMING_END_AND_PRINT (fac_hensel_lift12, "time for hensel lifting: ");
    57985797    DEBOUTLN (cerr, "lifted factors= " << uniFactors);
    57995798  }
     
    58025801    bool earlySuccess= false;
    58035802    CFList earlyFactors;
    5804     TIMING_START (fac_hensel_lift);
     5803    TIMING_START (fac_hensel_lift12);
    58055804    uniFactors= henselLiftAndEarly
    58065805               (A, earlySuccess, earlyFactors, degs, liftBound,
    58075806                uniFactors, info, evaluation);
    5808     TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
     5807    TIMING_END_AND_PRINT (fac_hensel_lift12, "time for hensel lifting: ");
    58095808    DEBOUTLN (cerr, "lifted factors= " << uniFactors);
    58105809
  • factory/facFqFactorize.cc

    rf3a82f4 r0b618a7  
    27052705    CFList MOD;
    27062706    bool earlySuccess;
    2707     CFList earlyFactors;
     2707    CFList earlyFactors, liftedFactors;
    27082708    TIMING_START (fac_hensel_lift);
    2709     CFList liftedFactors= henselLiftAndEarly
    2710                           (A, MOD, liftBounds, earlySuccess, earlyFactors,
    2711                            Aeval, biFactors, evaluation, info);
     2709    liftedFactors= henselLiftAndEarly
     2710                   (A, MOD, liftBounds, earlySuccess, earlyFactors,
     2711                    Aeval, biFactors, evaluation, info);
    27122712    TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
    27132713
  • factory/libfac/charset/alg_factor.cc

    rf3a82f4 r0b618a7  
    2828
    2929#include <libfac/factor/debug.h>
    30 #include "timing.h"
    31 TIMING_DEFINE_PRINT(newfactoras_time)
    3230
    3331static Varlist
Note: See TracChangeset for help on using the changeset viewer.