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

Coefficient_[iterator|begin|end] -> Coefficient_const_[iterator|begin|end] 

same for Innermost_coefficient
This commit is contained in:
Michael Hemmer 2008-10-02 09:29:43 +00:00
parent e9fbf83c5c
commit cd8e4bff2d
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_dfai.h
View File

@ -79,8 +79,8 @@ Polynomial<NT> modular_gcd_utcf_dfai(
typedef typename PT::Innermost_coefficient_type IC; typedef typename PT::Innermost_coefficient_type IC;
typename Coercion_traits<Poly,IC>::Cast ictp; typename Coercion_traits<Poly,IC>::Cast ictp;
typename PT::Innermost_coefficient_begin begin; typename PT::Innermost_coefficient_const_begin begin;
typename PT::Innermost_coefficient_end end; typename PT::Innermost_coefficient_const_end end;
typename PT::Innermost_leading_coefficient ilcoeff; typename PT::Innermost_leading_coefficient ilcoeff;
typedef Algebraic_extension_traits<IC> ANT; typedef Algebraic_extension_traits<IC> ANT;

4
Polynomial/include/CGAL/Polynomial/square_free_factorize.h
View File

@ -159,8 +159,8 @@ inline int square_free_factorize_for_regular_polynomial_
typedef typename Polynomial_traits_d<POLY>::Innermost_coefficient_type IC; typedef typename Polynomial_traits_d<POLY>::Innermost_coefficient_type IC;
typename Polynomial_traits_d<POLY>::Innermost_leading_coefficient ilcoeff; typename Polynomial_traits_d<POLY>::Innermost_leading_coefficient ilcoeff;
//typename Polynomial_traits_d<POLY>::Innermost_coefficient_to_polynomial ictp; //typename Polynomial_traits_d<POLY>::Innermost_coefficient_to_polynomial ictp;
typename Polynomial_traits_d<POLY>::Innermost_coefficient_begin begin; typename Polynomial_traits_d<POLY>::Innermost_coefficient_const_begin begin;
typename Polynomial_traits_d<POLY>::Innermost_coefficient_end end; typename Polynomial_traits_d<POLY>::Innermost_coefficient_const_end end;
typename Algebraic_extension_traits<IC>::Denominator_for_algebraic_integers dfai; typename Algebraic_extension_traits<IC>::Denominator_for_algebraic_integers dfai;
typename Algebraic_extension_traits<IC>::Normalization_factor nfac; typename Algebraic_extension_traits<IC>::Normalization_factor nfac;
typename Scalar_factor_traits<POLY>::Scalar_factor sfac; typename Scalar_factor_traits<POLY>::Scalar_factor sfac;

46
Polynomial/include/CGAL/Polynomial_traits_d.h
View File

@ -48,12 +48,12 @@
\ \
typedef CGAL::Recursive_const_flattening< d-1, \ typedef CGAL::Recursive_const_flattening< d-1, \
typename CGAL::Polynomial<Coefficient_type>::const_iterator > \ typename CGAL::Polynomial<Coefficient_type>::const_iterator > \
Coefficient_flattening; \ Coefficient_const_flattening; \
\ \
public: \ public: \
typedef typename Coefficient_flattening::Recursive_flattening_iterator \ typedef typename Coefficient_const_flattening::Recursive_flattening_iterator \
Innermost_coefficient_iterator; \ Innermost_coefficient_const_iterator; \
typedef typename Polynomial_d::iterator Coefficient_iterator; \ typedef typename Polynomial_d::const_iterator Coefficient_const_iterator; \
\ \
private: private:
@ -99,10 +99,10 @@ public:
: public std::unary_function< Polynomial_d , Innermost_coefficient_type >{ : public std::unary_function< Polynomial_d , Innermost_coefficient_type >{
Innermost_coefficient_type Innermost_coefficient_type
operator()(const Polynomial_d& p) const { operator()(const Polynomial_d& p) const {
typedef Innermost_coefficient_iterator IT; typedef Innermost_coefficient_const_iterator IT;
Innermost_coefficient_type content(0); Innermost_coefficient_type content(0);
for (IT it = typename PT::Innermost_coefficient_begin()(p); for (IT it = typename PT::Innermost_coefficient_const_begin()(p);
it != typename PT::Innermost_coefficient_end()(p); it != typename PT::Innermost_coefficient_const_end()(p);
it++){ it++){
content = CGAL::gcd(content, *it); content = CGAL::gcd(content, *it);
if(CGAL::is_one(content)) break; if(CGAL::is_one(content)) break;
@ -998,30 +998,30 @@ public:
// This is going to be in PolynomialToolBox // This is going to be in PolynomialToolBox
struct Coefficient_begin struct Coefficient_const_begin
: public std::unary_function< Polynomial_d, Coefficient_iterator > { : public std::unary_function< Polynomial_d, Coefficient_const_iterator > {
Coefficient_iterator Coefficient_const_iterator
operator () (const Polynomial_d& p) { return p.begin(); } operator () (const Polynomial_d& p) { return p.begin(); }
}; };
struct Coefficient_end struct Coefficient_const_end
: public std::unary_function< Polynomial_d, Coefficient_iterator > { : public std::unary_function< Polynomial_d, Coefficient_const_iterator > {
Coefficient_iterator Coefficient_const_iterator
operator () (const Polynomial_d& p) { return p.end(); } operator () (const Polynomial_d& p) { return p.end(); }
}; };
struct Innermost_coefficient_begin struct Innermost_coefficient_const_begin
: public std::unary_function< Polynomial_d, Innermost_coefficient_iterator > { : public std::unary_function< Polynomial_d, Innermost_coefficient_const_iterator > {
Innermost_coefficient_iterator Innermost_coefficient_const_iterator
operator () (const Polynomial_d& p) { operator () (const Polynomial_d& p) {
return typename Coefficient_flattening::Flatten()(p.end(),p.begin()); return typename Coefficient_const_flattening::Flatten()(p.end(),p.begin());
} }
}; };
struct Innermost_coefficient_end struct Innermost_coefficient_const_end
: public std::unary_function< Polynomial_d, Innermost_coefficient_iterator > { : public std::unary_function< Polynomial_d, Innermost_coefficient_const_iterator > {
Innermost_coefficient_iterator Innermost_coefficient_const_iterator
operator () (const Polynomial_d& p) { operator () (const Polynomial_d& p) {
return typename Coefficient_flattening::Flatten()(p.end(),p.end()); return typename Coefficient_const_flattening::Flatten()(p.end(),p.end());
} }
}; };
@ -1131,8 +1131,8 @@ public:
typename PT::Construct_polynomial construct; typename PT::Construct_polynomial construct;
typename PT::Innermost_leading_coefficient ilcoeff; typename PT::Innermost_leading_coefficient ilcoeff;
typename PT::Innermost_coefficient_begin begin; typename PT::Innermost_coefficient_const_begin begin;
typename PT::Innermost_coefficient_end end; typename PT::Innermost_coefficient_const_end end;
typedef Algebraic_extension_traits<Innermost_coefficient_type> AET; typedef Algebraic_extension_traits<Innermost_coefficient_type> AET;
typename AET::Denominator_for_algebraic_integers dfai; typename AET::Denominator_for_algebraic_integers dfai;
typename AET::Normalization_factor nfac; typename AET::Normalization_factor nfac;

18
Polynomial/test/Polynomial/Polynomial.cpp
View File

@ -874,15 +874,15 @@ void flat_iterator_tests() {
typedef CGAL::Polynomial_traits_d<POLY3> PT3; typedef CGAL::Polynomial_traits_d<POLY3> PT3;
int i; int i;
typename PT1::Innermost_coefficient_iterator it1; (void) it1; typename PT1::Innermost_coefficient_const_iterator it1; (void) it1;
typename PT1::Innermost_coefficient_begin begin1; (void) begin1; typename PT1::Innermost_coefficient_const_begin begin1; (void) begin1;
typename PT1::Innermost_coefficient_end end1; (void) end1; typename PT1::Innermost_coefficient_const_end end1; (void) end1;
typename PT2::Innermost_coefficient_iterator it2; (void) it2; typename PT2::Innermost_coefficient_const_iterator it2; (void) it2;
typename PT2::Innermost_coefficient_begin begin2; (void) begin2; typename PT2::Innermost_coefficient_const_begin begin2; (void) begin2;
typename PT2::Innermost_coefficient_end end2; (void) end2; typename PT2::Innermost_coefficient_const_end end2; (void) end2;
typename PT3::Innermost_coefficient_iterator it3; (void) it3; typename PT3::Innermost_coefficient_const_iterator it3; (void) it3;
typename PT3::Innermost_coefficient_begin begin3; (void) begin3; typename PT3::Innermost_coefficient_const_begin begin3; (void) begin3;
typename PT3::Innermost_coefficient_end end3; (void) end3; typename PT3::Innermost_coefficient_const_end end3; (void) end3;
for (i = 1, it1 = begin1(p1); i <= 3; ++i, ++it1) for (i = 1, it1 = begin1(p1); i <= 3; ++i, ++it1)
assert(*it1 == i); assert(*it1 == i);