songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed various compile problems 

LiS_HAVE_CORE -> CGAL_USE_CORE
LiS_HAVE_NTL -> CGAL_USE_NTL
gcd -> gcd_
gcd_utcf -> gcd_utcf_
Comment: This file has not been touched for a while,
but now that NTL is supported, it's back in life.
This commit is contained in:
Eric Berberich 2012-08-20 09:45:09 +00:00
parent 80616feea6
commit f22cbb51f4
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Polynomial/include/CGAL/Polynomial/polynomial_gcd.h
View File

@ -46,8 +46,7 @@
#include <CGAL/Polynomial/polynomial_gcd_implementations.h>
#include <CGAL/polynomial_utils.h>
//#undef LiS_HAVE_NTL
#ifdef LiS_HAVE_NTL
#ifdef CGAL_USE_NTL
#include <CGAL/Polynomial/polynomial_gcd_ntl.h>
#endif

23
Polynomial/include/CGAL/Polynomial/polynomial_gcd_ntl.h
View File

@ -17,7 +17,7 @@
//
//
// Author(s) : Michael Kerber <mkerber@mpi-inf.mpg.de>
// Dominik Hlse <dominik.huelse@gmx.de>
// Dominik Huelse <dominik.huelse@gmx.de>
// Michael Hemmer <hemmer@informatik.uni-mainz.de>
// ============================================================================
@ -30,9 +30,9 @@
#include <CGAL/basic.h>
#ifndef LiS_HAVE_NTL
#ifndef CGAL_USE_NTL
#warning This header file needs NTL installed in order to work properly.
#else // LiS_HAVE_NTL
#else // CGAL_USE_NTL
#ifndef CGAL_USE_NTL_MODULAR_GCD
#define CGAL_USE_NTL_MODULAR_GCD 1
@ -105,8 +105,7 @@ void ntl_to_polynomial(const NTL::ZZX& q,PolyInt& p) {
template<typename NT> Polynomial<NT>
inline
modular_NTL_gcd_for_univariate_integer_polynomials
(Polynomial<NT> p1,
Polynomial<NT> p2) {
(Polynomial<NT> p1, Polynomial<NT> p2) {
// std::cout<<" NTL GCD"<<std::endl;
NTL::ZZX q1,q2,h;
@ -132,7 +131,7 @@ modular_NTL_gcd_for_univariate_integer_polynomials
template <>
inline
CGAL::Polynomial<leda::integer>
gcd_utcf(const CGAL::Polynomial<leda::integer>& p1,
gcd_utcf_(const CGAL::Polynomial<leda::integer>& p1,
const CGAL::Polynomial<leda::integer>& p2) {
CGAL::Polynomial<leda::integer> gcd =
internal::modular_NTL_gcd_for_univariate_integer_polynomials(p1,p2);
@ -141,17 +140,17 @@ gcd_utcf(const CGAL::Polynomial<leda::integer>& p1,
template <>
inline
CGAL::Polynomial<leda::integer>
gcd(const CGAL::Polynomial<leda::integer>& p1,
gcd_(const CGAL::Polynomial<leda::integer>& p1,
const CGAL::Polynomial<leda::integer>& p2) {
return internal::modular_NTL_gcd_for_univariate_integer_polynomials(p1,p2);
}
#endif // CGAL_USE_LEDA
#ifdef LiS_HAVE_CORE
#ifdef CGAL_USE_CORE
template <>
inline
Polynomial<CORE::BigInt>
gcd_utcf(const Polynomial<CORE::BigInt>& p1,
gcd_utcf_(const Polynomial<CORE::BigInt>& p1,
const Polynomial<CORE::BigInt>& p2) {
Polynomial<CORE::BigInt> gcd = modular_NTL_gcd_for_univariate_integer_polynomials(p1,p2);
return CGAL::canonicalize(gcd);
@ -159,11 +158,11 @@ gcd_utcf(const Polynomial<CORE::BigInt>& p1,
template <>
inline
Polynomial<CORE::BigInt>
gcd(const Polynomial<CORE::BigInt>& p1,
gcd_(const Polynomial<CORE::BigInt>& p1,
const Polynomial<CORE::BigInt>& p2) {
return modular_NTL_gcd_for_univariate_integer_polynomials(p1,p2);
}
#endif //LiS_HAVE_CORE
#endif //CGAL_USE_CORE
//#endif //CGAL_USE_INTERNAL_MODULAR_GCD
@ -174,7 +173,7 @@ gcd(const Polynomial<CORE::BigInt>& p1,
#endif // CGAL_USE_NTL_MODULAR_GCD
#endif // LiS_HAVE_NTL
#endif // CGAL_USE_NTL
#endif // CGAL_POLYNOMIAL_GCD_NTL_H