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

Fixed generic_random_test 

-- used proper types
-- removed useless stuff
-- made readable
This commit is contained in:
Mael Rouxel-Labbé 2017-05-03 18:29:03 +02:00
parent 3170393ea9
commit 920fe90f0d
1 changed files with 91 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
Generator/test/Generator/generic_random_test.cpp
View File

@ -21,35 +21,62 @@
#include <CGAL/boost/graph/helpers.h> #include <CGAL/boost/graph/helpers.h>
#include <iostream> #include <iostream>
using namespace CGAL::parameters;
typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
typedef K::FT FT;
typedef K::Point_2 Point_2;
typedef K::Point_3 Point_3;
typedef K::Weighted_point_3 Weighted_point_3;
typedef K::Triangle_2 Triangle_2;
typedef K::Triangle_3 Triangle_3;
typedef CGAL::Triangulation_vertex_base_2<K> Vb; typedef CGAL::Triangulation_vertex_base_2<K> Vb;
typedef CGAL::Delaunay_mesh_face_base_2<K> Fb; typedef CGAL::Delaunay_mesh_face_base_2<K> Fb;
typedef CGAL::Triangulation_data_structure_2<Vb, Fb> Tds; typedef CGAL::Triangulation_data_structure_2<Vb, Fb> Tds;
typedef CGAL::Constrained_Delaunay_triangulation_2<K, Tds> CDT; typedef CGAL::Constrained_Delaunay_triangulation_2<K, Tds> CDT;
typedef CGAL::Polygon_2<K> Polygon_2;
using namespace CGAL;
typedef CGAL::Polygon_2<K> Polygon_2;
typedef CGAL::Polyhedron_3<K> Polyhedron;
// Domain
typedef CGAL::Polyhedral_mesh_domain_3<Polyhedron, K> Mesh_domain;
// Triangulation
#ifdef CGAL_CONCURRENT_MESH_3
typedef CGAL::Parallel_tag Concurrency_tag;
#else
typedef CGAL::Sequential_tag Concurrency_tag;
#endif
typedef CGAL::Mesh_triangulation_3<Mesh_domain,CGAL::Default,Concurrency_tag>::type Tr;
typedef CGAL::Mesh_complex_3_in_triangulation_3<Tr> C3t3;
typedef CGAL::Mesh_criteria_3<Tr> Mesh_criteria;
typedef C3t3::Point Point;
int test_triangles_2() int test_triangles_2()
{ {
typedef K::Point_2 Point;
// Generated points are in that vector // Generated points are in that vector
std::vector<Point> points; std::vector<Point_2> points;
// Create input triangles // Create input triangles
std::vector<K::Triangle_2> triangles; std::vector<Triangle_2> triangles;
triangles.push_back(K::Triangle_2(Point(0,0), Point(0.5,0), Point(0,0.5))); triangles.push_back(Triangle_2(Point_2(0,0), Point_2(0.5,0), Point_2(0,0.5)));
triangles.push_back(K::Triangle_2(Point(0,0.5), Point(0.5,0), Point(0.5,0.5))); triangles.push_back(Triangle_2(Point_2(0,0.5), Point_2(0.5,0), Point_2(0.5,0.5)));
// Create the generator, input is the vector of Triangle_2 // Create the generator, input is the vector of Triangle_2
Random_points_in_triangles_2<Point> g(triangles); CGAL::Random_points_in_triangles_2<Point_2> g(triangles);
// Get 100 random points in triangle range // Get 100 random points in triangle range
CGAL::cpp11::copy_n(g, 100, std::back_inserter(points)); CGAL::cpp11::copy_n(g, 100, std::back_inserter(points));
// Check that we have really created 100 points. // Check that we have really created 100 points.
assert( points.size() == 100); assert( points.size() == 100);
BOOST_FOREACH(Point p, points) BOOST_FOREACH(Point_2 p, points)
{ {
bool on_quad = p.x() > -0.01 && p.x() < 0.51 bool on_quad = p.x() > -0.01 && p.x() < 0.51
&& p.y() > -0.01 && p.y() < 0.51; && p.y() > -0.01 && p.y() < 0.51;
@ -66,26 +93,26 @@ int test_triangles_2()
int test_triangles_3() int test_triangles_3()
{ {
typedef K::Point_3 Point;
// Generated points are in that vector // Generated points are in that vector
std::vector<Point> points; std::vector<Point_3> points;
// Create input triangles // Create input triangles
std::vector<K::Triangle_3> triangles; std::vector<Triangle_3> triangles;
triangles.push_back(K::Triangle_3(Point(0,0,0), Point(0.5,0,0), Point(0,0.5,0))); triangles.push_back(Triangle_3(Point_3(0,0,0), Point_3(0.5,0,0), Point_3(0,0.5,0)));
triangles.push_back(K::Triangle_3(Point(0,0.5,0), Point(0.5,0,0), Point(0.5,0.5,0))); triangles.push_back(Triangle_3(Point_3(0,0.5,0), Point_3(0.5,0,0), Point_3(0.5,0.5,0)));
triangles.push_back(K::Triangle_3(Point(0.5,0,0), Point(0.5,0,0.5), Point(0.5,0.5,0))); triangles.push_back(Triangle_3(Point_3(0.5,0,0), Point_3(0.5,0,0.5), Point_3(0.5,0.5,0)));
triangles.push_back(K::Triangle_3(Point(0.5,0.5,0), Point(0.5,0.5,0.5), Point(0.5,0.,0.5))); triangles.push_back(Triangle_3(Point_3(0.5,0.5,0), Point_3(0.5,0.5,0.5), Point_3(0.5,0.,0.5)));
// Create the generator, input is the vector of Triangle_3 // Create the generator, input is the vector of Triangle_3
Random_points_in_triangles_3<Point> g(triangles); CGAL::Random_points_in_triangles_3<Point_3> g(triangles);
// Get 100 random points in triangle range // Get 100 random points in triangle range
CGAL::cpp11::copy_n(g, 100, std::back_inserter(points)); CGAL::cpp11::copy_n(g, 100, std::back_inserter(points));
// Check that we have really created 100 points. // Check that we have really created 100 points.
assert( points.size() == 100); assert( points.size() == 100);
BOOST_FOREACH(Point p, points) BOOST_FOREACH(Point_3 p, points)
{ {
bool on_front = p.z() < 0.01 && p.z()> -0.01 bool on_front = p.z() < 0.01 && p.z()> -0.01
&& p.x() > -0.01 && p.x() < 0.51 && p.x() > -0.01 && p.x() < 0.51
@ -108,10 +135,11 @@ int test_triangles_3()
int test_T2() int test_T2()
{ {
typedef CDT::Point Point_2;
std::vector<Point_2> points; std::vector<Point_2> points;
//construct two non-intersecting nested polygons //construct two non-intersecting nested polygons
::Polygon_2 polygon1; Polygon_2 polygon1;
polygon1.push_back(Point_2(0,0)); polygon1.push_back(Point_2(0,0));
polygon1.push_back(Point_2(2,0)); polygon1.push_back(Point_2(2,0));
polygon1.push_back(Point_2(2,2)); polygon1.push_back(Point_2(2,2));
@ -121,9 +149,8 @@ polygon1.push_back(Point_2(0,2));
CDT cdt; CDT cdt;
cdt.insert_constraint(polygon1.vertices_begin(), polygon1.vertices_end(), true); cdt.insert_constraint(polygon1.vertices_begin(), polygon1.vertices_end(), true);
Random_points_in_triangle_mesh_2<Point_2, CDT> CGAL::Random_points_in_triangle_mesh_2<Point_2, CDT> g(cdt);
g(cdt); CGAL::cpp11::copy_n( g, 300, std::back_inserter(points));
cpp11::copy_n( g, 300, std::back_inserter(points));
for(std::size_t i = 0; i<points.size(); ++i) for(std::size_t i = 0; i<points.size(); ++i)
{ {
Point_2 p = points[i]; Point_2 p = points[i];
@ -142,10 +169,6 @@ for(std::size_t i = 0; i<points.size(); ++i)
return 1; return 1;
} }
typedef CGAL::Polyhedron_3<K> Polyhedron;
typedef K::Point_3 Point;
typedef K::FT FT;
bool on_face(int face, double coord[3]) bool on_face(int face, double coord[3])
{ {
if(CGAL::abs(CGAL::abs(coord[face]) - 0.5) < 0.05 if(CGAL::abs(CGAL::abs(coord[face]) - 0.5) < 0.05
@ -157,15 +180,12 @@ bool on_face(int face, double coord[3])
int test_volume_mesh(Polyhedron& polyhedron) int test_volume_mesh(Polyhedron& polyhedron)
{ {
std::vector<Point_3> points;
CGAL::Random_points_in_triangle_mesh_3<Polyhedron> g(polyhedron);
std::vector<Point> points;
Random_points_in_triangle_mesh_3<Polyhedron>
g(polyhedron);
CGAL::cpp11::copy_n( g, 300, std::back_inserter(points)); CGAL::cpp11::copy_n( g, 300, std::back_inserter(points));
for (std::size_t i = 0; i<points.size(); ++i) for (std::size_t i = 0; i<points.size(); ++i)
{ {
Point p= points[i]; Point_3 p = points[i];
double coords[3] = {p.x(), p.y(), p.z()}; double coords[3] = {p.x(), p.y(), p.z()};
if(!(on_face(0, coords) || on_face(1, coords) || on_face(2,coords))) if(!(on_face(0, coords) || on_face(1, coords) || on_face(2,coords)))
{ {
@ -176,43 +196,23 @@ int test_volume_mesh(Polyhedron& polyhedron)
return 1; return 1;
} }
// Domain
typedef CGAL::Polyhedral_mesh_domain_3<Polyhedron, K> Mesh_domain;
#ifdef CGAL_CONCURRENT_MESH_3
typedef CGAL::Parallel_tag Concurrency_tag;
#else
typedef CGAL::Sequential_tag Concurrency_tag;
#endif
// Triangulation
typedef CGAL::Mesh_triangulation_3<Mesh_domain,CGAL::Default,Concurrency_tag>::type Tr;
typedef CGAL::Mesh_complex_3_in_triangulation_3<Tr> C3t3;
// Criteria
typedef CGAL::Mesh_criteria_3<Tr> Mesh_criteria;
typedef C3t3::Point Point_c3t3;
int test_on_c3t3(const Polyhedron& polyhedron) int test_on_c3t3(const Polyhedron& polyhedron)
{ {
std::vector<Point_c3t3> points; std::vector<Point_3> points;
points.clear();
// Create domain // Create domain
Mesh_domain domain(polyhedron); Mesh_domain domain(polyhedron);
using namespace CGAL::parameters;
// Mesh criteria (no cell_size set) // Mesh criteria (no cell_size set)
Mesh_criteria criteria(facet_angle=25, facet_size=0.15, facet_distance=0.008, Mesh_criteria criteria(facet_angle=25, facet_size=0.15, facet_distance=0.008,
cell_radius_edge_ratio=3); cell_radius_edge_ratio=3);
// Mesh generation // Mesh generation
C3t3 c3t3 = CGAL::make_mesh_3<C3t3>(domain, criteria, no_perturb(), no_exude()); C3t3 c3t3 = CGAL::make_mesh_3<C3t3>(domain, criteria, no_perturb(), no_exude());
Random_points_in_tetrahedral_mesh_boundary_3<C3t3> CGAL::Random_points_in_tetrahedral_mesh_boundary_3<C3t3> g(c3t3);
g(c3t3);
CGAL::cpp11::copy_n(g, 300, std::back_inserter(points)); CGAL::cpp11::copy_n(g, 300, std::back_inserter(points));
for (std::size_t i = 0; i<points.size(); ++i) for (std::size_t i = 0; i<points.size(); ++i)
{ {
Point p= points[i]; Point_3 p = points[i];
double coords[3] = {p.x(), p.y(), p.z()}; double coords[3] = {p.x(), p.y(), p.z()};
if(!(on_face(0, coords) || on_face(1, coords) || on_face(2,coords))) if(!(on_face(0, coords) || on_face(1, coords) || on_face(2,coords)))
{ {
@ -225,23 +225,23 @@ int test_on_c3t3(const Polyhedron& polyhedron)
int test_in_c3t3(const Polyhedron& polyhedron) int test_in_c3t3(const Polyhedron& polyhedron)
{ {
std::vector<Point> points; std::vector<Point_3> points;
points.clear();
// Create domain // Create domain
Mesh_domain domain(polyhedron); Mesh_domain domain(polyhedron);
using namespace CGAL::parameters;
// Mesh criteria (no cell_size set) // Mesh criteria (no cell_size set)
Mesh_criteria criteria(facet_angle=25, facet_size=0.15, facet_distance=0.008, Mesh_criteria criteria(facet_angle=25, facet_size=0.15, facet_distance=0.008,
cell_radius_edge_ratio=3); cell_radius_edge_ratio=3);
// Mesh generation // Mesh generation
C3t3 c3t3 = CGAL::make_mesh_3<C3t3>(domain, criteria, no_perturb(), no_exude()); C3t3 c3t3 = CGAL::make_mesh_3<C3t3>(domain, criteria, no_perturb(), no_exude());
Random_points_in_tetrahedral_mesh_3<C3t3> CGAL::Random_points_in_tetrahedral_mesh_3<C3t3> g(c3t3);
g(c3t3);
CGAL::cpp11::copy_n(g, 300, std::back_inserter(points)); CGAL::cpp11::copy_n(g, 300, std::back_inserter(points));
for (std::size_t i = 0; i<points.size(); ++i) for (std::size_t i = 0; i<points.size(); ++i)
{ {
Point p= points[i]; Point_3 p = points[i];
double coords[3] = {p.x(), p.y(), p.z()}; double coords[3] = {p.x(), p.y(), p.z()};
for(int j = 0; j< 3; ++j) for(int j = 0; j< 3; ++j)
if(CGAL::abs(coords[j]) > 0.501) if(CGAL::abs(coords[j]) > 0.501)
@ -253,22 +253,21 @@ int test_in_c3t3(const Polyhedron& polyhedron)
return 1; return 1;
} }
int int main()
main( )
{ {
Polyhedron polyhedron; Polyhedron polyhedron;
make_hexahedron(Point(-0.5,-0.5,-0.5), Point(0.5,-0.5,-0.5), Point(0.5,0.5,-0.5), Point(-0.5,0.5,-0.5), make_hexahedron(Point_3(-0.5,-0.5,-0.5), Point_3(0.5,-0.5,-0.5), Point_3(0.5,0.5,-0.5), Point_3(-0.5,0.5,-0.5),
Point(-0.5,0.5,0.5), Point(-0.5,-0.5,0.5), Point(0.5,-0.5,0.5), Point(0.5,0.5,0.5), Point_3(-0.5,0.5,0.5), Point_3(-0.5,-0.5,0.5), Point_3(0.5,-0.5,0.5), Point_3(0.5,0.5,0.5),
polyhedron); polyhedron);
boost::graph_traits<Polyhedron>::halfedge_descriptor facets[6]; boost::graph_traits<Polyhedron>::halfedge_descriptor facets[6];
int i = 0; int i = 0;
BOOST_FOREACH(boost::graph_traits<Polyhedron>::face_descriptor fd, faces(polyhedron)) BOOST_FOREACH(boost::graph_traits<Polyhedron>::face_descriptor fd, faces(polyhedron))
facets[i++] = halfedge(fd, polyhedron); facets[i++] = halfedge(fd, polyhedron);
for(int i=0; i<6; ++i) for(int i=0; i<6; ++i)
CGAL::Euler::split_face(facets[i],next(next(facets[i], polyhedron), polyhedron), polyhedron); CGAL::Euler::split_face(facets[i],next(next(facets[i], polyhedron), polyhedron), polyhedron);
int validity = int validity =
test_triangles_2() test_triangles_2()
*test_triangles_3() *test_triangles_3()