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

remove compiler warnings in tests

This commit is contained in:
Eric Berberich 2012-07-05 09:50:20 +00:00
parent 397f0e4131
commit 230919c8d6
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Xy_coordinate_2.h
View File

@ -270,10 +270,12 @@ public:
typedef std::vector< Algebraic_real_1 > Roots;
typedef typename Curve_analysis_2::Status_line_1 Key;
typedef Roots Data;
typedef std::map< Key, Data, CGAL::Handle_id_less_than< Key > >
Y_root_map;
// EBEB 2012-07-05 deactivated map for y-roots for not being used
// typedef std::map< Key, Data, CGAL::Handle_id_less_than< Key > >
// Y_root_map;
static Y_root_map y_root_map;
// EBEB 2012-07-05 deactivated map for y-roots for not being used
//static Y_root_map y_root_map;
if (!this->ptr()->_m_y) {
@ -287,8 +289,9 @@ public:
typename Curve_analysis_2::Status_line_1 line =
curve().status_line_at_exact_x(x());
typename Y_root_map::iterator yit =
y_root_map.find(line);
// EBEB 2012-07-05 deactivated map for y-roots for not being used
//typename Y_root_map::iterator yit =
// y_root_map.find(line);
// TODO: Cache resultant computation
// exacus-related code shouldn't be used here

16
Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h
View File

@ -208,7 +208,7 @@ void test_algebraic_kernel_1(const AlgebraicKernel_d_1& ak_1){
typedef std::vector<std::pair<Algebraic_real_1,unsigned int> > ROOTS;
ROOTS roots;
Polynomial_1 p1 = (x-1)*(x-2)*(x-2);
std::back_insert_iterator<ROOTS> biit =
// std::back_insert_iterator<ROOTS> biit =
solve_1(p1,std::back_inserter(roots));
Algebraic_real_1 ar = roots[1].first;
Polynomial_1 p2 = compute_polynomial_1(ar);
@ -355,25 +355,21 @@ void test_algebraic_kernel_1(const AlgebraicKernel_d_1& ak_1){
ss>>CGAL::iformat(alg2); \
assert(alg1==alg2)
const typename Algebraic_kernel_d_1::Construct_algebraic_real_1 construct_algreal_1 =
ak_1.construct_algebraic_real_1_object();
Algebraic_real_1 alg1,alg2;
std::stringstream ss;
CGAL::set_ascii_mode(ss);
// test construction from int, Coefficient and Bound
CGAL_TEST_ALGEBRAIC_REAL_IO(construct_algreal_1(int(2)));
CGAL_TEST_ALGEBRAIC_REAL_IO(construct_algreal_1(Coefficient(2)));
CGAL_TEST_ALGEBRAIC_REAL_IO(construct_algreal_1(Bound(2)));
CGAL_TEST_ALGEBRAIC_REAL_IO(construct_algebraic_real_1(int(2)));
CGAL_TEST_ALGEBRAIC_REAL_IO(construct_algebraic_real_1(Coefficient(2)));
CGAL_TEST_ALGEBRAIC_REAL_IO(construct_algebraic_real_1(Bound(2)));
// construction by index
Polynomial_1 x = CGAL::shift(Polynomial_1(1),1); // the monom x
CGAL_TEST_ALGEBRAIC_REAL_IO(construct_algreal_1(x*x-2,1));
CGAL_TEST_ALGEBRAIC_REAL_IO(construct_algebraic_real_1(x*x-2,1));
// construction by isolating interval
CGAL_TEST_ALGEBRAIC_REAL_IO(construct_algreal_1(x*x-2,Bound(0),Bound(2)));
CGAL_TEST_ALGEBRAIC_REAL_IO(construct_algebraic_real_1(x*x-2,Bound(0),Bound(2)));
#undef CGAL_TEST_ALGEBRAIC_REAL_IO
}
}