[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit 53b4c536e74148b561bbdd860a27badba5991e1c
Author: Martin Lee <martinlee84 at web.de>
Date:   Thu Feb 16 15:21:25 2012 +0100

    chg: added coeff bound to univariate operations

diff --git a/factory/facMul.cc b/factory/facMul.cc
index a880677..8e0201c 100644
--- a/factory/facMul.cc
+++ b/factory/facMul.cc
@@ -393,7 +393,7 @@ newtonDiv (const CanonicalForm& F, const CanonicalForm& G, CanonicalForm& Q)
 #endif
 
 CanonicalForm
-mulNTL (const CanonicalForm& F, const CanonicalForm& G)
+mulNTL (const CanonicalForm& F, const CanonicalForm& G, const modpk& b)
 {
   if (F.inCoeffDomain() || G.inCoeffDomain() || getCharacteristic() == 0)
   {
@@ -447,7 +447,7 @@ mulNTL (const CanonicalForm& F, const CanonicalForm& G)
 }
 
 CanonicalForm
-modNTL (const CanonicalForm& F, const CanonicalForm& G)
+modNTL (const CanonicalForm& F, const CanonicalForm& G, const modpk& b)
 {
   if (F.inCoeffDomain() && G.isUnivariate())
     return F;
@@ -510,7 +510,7 @@ modNTL (const CanonicalForm& F, const CanonicalForm& G)
 }
 
 CanonicalForm
-divNTL (const CanonicalForm& F, const CanonicalForm& G)
+divNTL (const CanonicalForm& F, const CanonicalForm& G, const modpk& b)
 {
   if (F.inCoeffDomain() && G.isUnivariate())
     return F;
diff --git a/factory/facMul.h b/factory/facMul.h
index a25f85f..d15a586 100644
--- a/factory/facMul.h
+++ b/factory/facMul.h
@@ -15,6 +15,7 @@
 #define FAC_MUL_H
 
 #include "canonicalform.h"
+#include "fac_util.h"
 
 /// multiplication of univariate polys over a finite field using NTL, if we are
 /// in GF factory's default multiplication is used.
@@ -22,7 +23,8 @@
 /// @return @a mulNTL returns F*G
 CanonicalForm
 mulNTL (const CanonicalForm& F, ///< [in] a univariate poly
-        const CanonicalForm& G  ///< [in] a univariate poly
+        const CanonicalForm& G, ///< [in] a univariate poly
+        const modpk& b= modpk() ///< [in] coeff bound
        );
 
 /// mod of univariate polys over a finite field using NTL, if we are
@@ -31,7 +33,8 @@ mulNTL (const CanonicalForm& F, ///< [in] a univariate poly
 /// @return @a modNTL returns F mod G
 CanonicalForm
 modNTL (const CanonicalForm& F, ///< [in] a univariate poly
-        const CanonicalForm& G  ///< [in] a univariate poly
+        const CanonicalForm& G, ///< [in] a univariate poly
+        const modpk& b= modpk() ///< [in] coeff bound
        );
 
 /// division of univariate polys over a finite field using NTL, if we are
@@ -40,7 +43,8 @@ modNTL (const CanonicalForm& F, ///< [in] a univariate poly
 /// @return @a divNTL returns F/G
 CanonicalForm
 divNTL (const CanonicalForm& F, ///< [in] a univariate poly
-        const CanonicalForm& G  ///< [in] a univariate poly
+        const CanonicalForm& G, ///< [in] a univariate poly
+        const modpk& b= modpk() ///< [in] coeff bound
        );
 
 /// division with remainder of @a F by

-- 
an open source computer algebra system