[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323
Bernhard R. Link
brlink at debian.org
Tue Apr 24 15:53:23 UTC 2012
The following commit has been merged in the cleanedupstream branch:
commit 23d12db7aae97ce890ae39909072fd212ccf1eb9
Author: Martin Lee <martinlee84 at web.de>
Date: Tue Feb 21 15:46:20 2012 +0100
fix: compilation errors with --enable-timing
diff --git a/factory/facFactorize.cc b/factory/facFactorize.cc
index e160e42..410c2d4 100644
--- a/factory/facFactorize.cc
+++ b/factory/facFactorize.cc
@@ -27,6 +27,10 @@
#include "cf_reval.h"
#include "facSparseHensel.h"
+TIMING_DEFINE_PRINT(fac_bi_factorizer)
+TIMING_DEFINE_PRINT(fac_hensel_lift)
+TIMING_DEFINE_PRINT(fac_factor_recombination)
+
CFList evalPoints (const CanonicalForm& F, CFList& eval, Evaluation& E)
{
CFList result;
@@ -964,10 +968,11 @@ multiFactorize (const CanonicalForm& F, const Variable& v)
bool earlySuccess;
CFList earlyFactors;
ExtensionInfo info= ExtensionInfo (false);
+ CFList liftedFactors;
TIMING_START (fac_hensel_lift);
- CFList liftedFactors= henselLiftAndEarly
- (A, MOD, liftBounds, earlySuccess, earlyFactors,
- Aeval, biFactors, evaluation, info);
+ liftedFactors= henselLiftAndEarly
+ (A, MOD, liftBounds, earlySuccess, earlyFactors,
+ Aeval, biFactors, evaluation, info);
TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
TIMING_START (fac_factor_recombination);
diff --git a/factory/facFqBivar.cc b/factory/facFqBivar.cc
index f90e5d3..ce3a055 100644
--- a/factory/facFqBivar.cc
+++ b/factory/facFqBivar.cc
@@ -36,9 +36,9 @@
#ifdef HAVE_NTL
#include "NTLconvert.h"
-TIMING_DEFINE_PRINT(fac_uni_factorizer);
-TIMING_DEFINE_PRINT(fac_hensel_lift);
-TIMING_DEFINE_PRINT(fac_factor_recombination);
+TIMING_DEFINE_PRINT(fac_uni_factorizer)
+TIMING_DEFINE_PRINT(fac_hensel_lift)
+TIMING_DEFINE_PRINT(fac_factor_recombination)
CanonicalForm prodMod0 (const CFList& L, const CanonicalForm& M)
{
diff --git a/factory/facFqFactorize.cc b/factory/facFqFactorize.cc
index 7a79fab..807fa6b 100644
--- a/factory/facFqFactorize.cc
+++ b/factory/facFqFactorize.cc
@@ -34,9 +34,9 @@
#include <NTL/ZZ_pEX.h>
#include "NTLconvert.h"
-TIMING_DEFINE_PRINT(fac_bi_factorizer);
-TIMING_DEFINE_PRINT(fac_hensel_lift);
-TIMING_DEFINE_PRINT(fac_factor_recombination);
+TIMING_DEFINE_PRINT(fac_bi_factorizer)
+TIMING_DEFINE_PRINT(fac_hensel_lift)
+TIMING_DEFINE_PRINT(fac_factor_recombination)
static inline
CanonicalForm
@@ -2699,11 +2699,11 @@ multiFactorize (const CanonicalForm& F, const ExtensionInfo& info)
CFList MOD;
bool earlySuccess;
- CFList earlyFactors;
+ CFList earlyFactors, liftedFactors;
TIMING_START (fac_hensel_lift);
- CFList liftedFactors= henselLiftAndEarly
- (A, MOD, liftBounds, earlySuccess, earlyFactors,
- Aeval, biFactors, evaluation, info);
+ liftedFactors= henselLiftAndEarly
+ (A, MOD, liftBounds, earlySuccess, earlyFactors,
+ Aeval, biFactors, evaluation, info);
TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
if (!extension)
--
an open source computer algebra system
More information about the debian-science-commits
mailing list