mirror of https://github.com/CGAL/cgal
Verify result of the new minkowski_sum_2 as well
To allow compilation, remove the VC++ workaround, which yielded failing static assertions with clang and g++ in the new code.
This commit is contained in:
parent
1ab69b0d0b
commit
6ef7cdae7c
|
|
@ -21,10 +21,7 @@
|
||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
// instead of
|
typedef CGAL::Cartesian<Rational> Kernel;
|
||||||
//typedef CGAL::Cartesian<Rational> Kernel;
|
|
||||||
// workaround for VC++
|
|
||||||
struct Kernel : public CGAL::Cartesian<Rational> {};
|
|
||||||
|
|
||||||
typedef Kernel::Point_2 Point_2;
|
typedef Kernel::Point_2 Point_2;
|
||||||
typedef Kernel::Segment_2 Segment_2;
|
typedef Kernel::Segment_2 Segment_2;
|
||||||
|
|
@ -98,6 +95,19 @@ int main (int argc, char **argv)
|
||||||
std::cout << "Using the convolution method ... ";
|
std::cout << "Using the convolution method ... ";
|
||||||
sum_conv = minkowski_sum_2 (pgn1, pgn2);
|
sum_conv = minkowski_sum_2 (pgn1, pgn2);
|
||||||
std::cout << "Done." << std::endl;
|
std::cout << "Done." << std::endl;
|
||||||
|
|
||||||
|
Polygon_with_holes_2 sum_conv_new;
|
||||||
|
std::cout << "Using the reduced convolution method ... ";
|
||||||
|
sum_conv_new = minkowski_sum_2_new (pgn1, pgn2);
|
||||||
|
if (are_equal (sum_conv, sum_conv_new))
|
||||||
|
{
|
||||||
|
std::cout << "OK." << std::endl;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
std::cout << "ERROR (different result)." << std::endl;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
// Define auxiliary polygon-decomposition objects.
|
// Define auxiliary polygon-decomposition objects.
|
||||||
CGAL::Small_side_angle_bisector_decomposition_2<Kernel> ssab_decomp;
|
CGAL::Small_side_angle_bisector_decomposition_2<Kernel> ssab_decomp;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue