Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AABB_tree/benchmark/AABB_tree/knot_generation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ int main(int argc, char* argv[])
const int tubular_segments = argc > 7 ? std::atoi(argv[7]) : 120;
const int radial_segments = argc > 8 ? std::atoi(argv[8]) : 60;

const double exc = argc > 9 ? std::atof(argv[9]) : 1; // excentricity
const double exc = argc > 9 ? std::atof(argv[9]) : 1; // eccentricity

std::vector<Point> vertices;
std::vector<Triangle> faces;
Expand Down Expand Up @@ -119,4 +119,4 @@ int main(int argc, char* argv[])
CGAL::IO::write_polygon_soup(filename, vertices, faces);

return 0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ class Arr_Bezier_curve_traits_2 {
}; /* end Arr_Bezier_curve_traits_2::X_monotone_curve_2 */

/*! \class Trim_2
* A functor for triming curves.
* A functor for trimming curves.
*/
class Trim_2 {
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ class Arr_circle_segment_traits_2 {
}; /* end Arr_circle_segment_traits_2::X_monotone_curve_2 */

/*! \class Trim_2
* A functor for triming curves.
* A functor for trimming curves.
*/
class Trim_2 {
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ class Arr_conic_traits_2 {
};

/*! \class Trim_2
* A functor for triming curves.
* A functor for trimming curves.
*/
class Trim_2 {
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class Arr_linear_traits_2 {
}; /* end Arr_linear_traits_2::X_monotone_curve_2 */

/*! \class Trim_2
* A functor for triming curves.
* A functor for trimming curves.
*/
class Trim_2 {
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ class Arr_polycurve_traits_2 {
}; /* end of Arr_polycurve_traits_2::Push_front_2 */

/*! \class Trim_2
* A functor for triming curves.
* A functor for trimming curves.
*/
class Trim_2 {
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class Arr_segment_traits_2 : public Kernel {
typedef X_monotone_curve_2 Curve_2;

/*! \class Trim_2
* A functor for triming curves.
* A functor for trimming curves.
*/
class Trim_2 {
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void two_meshes_intersection(std::string fname1, std::string fname2){
out.clear();
PMP::experimental::AABB_two_trees_meshes_intersections(tm1, tm2, std::back_inserter(out), CGAL::parameters::concurrency_tag(CGAL::Parallel_tag()));
std::cout << "number intersections: " << out.size() << std::endl;
std::cout << "Two tree AABB intersecton time: " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;
std::cout << "Two tree AABB intersection time: " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;

t.stop(); rt.stop();
t.reset(); rt.reset();
Expand All @@ -74,7 +74,7 @@ void two_meshes_intersection(std::string fname1, std::string fname2){
out.clear();
PMP::experimental::AABB_two_trees_meshes_intersections(tm1, tm2, std::back_inserter(out));
std::cout << "number intersections: " << out.size() << std::endl;
std::cout << "Two tree AABB intersecton time (Sequential): " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;
std::cout << "Two tree AABB intersection time (Sequential): " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;

t.stop(); rt.stop();
t.reset(); rt.reset();
Expand All @@ -83,7 +83,7 @@ void two_meshes_intersection(std::string fname1, std::string fname2){
out.clear();
PMP::experimental::mixed_meshes_intersections(tm1, tm2, std::back_inserter(out), CGAL::parameters::concurrency_tag(CGAL::Parallel_tag()));
std::cout << "number intersections: " << out.size() << std::endl;
std::cout << "Mixed intersecton time: " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;
std::cout << "Mixed intersection time: " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;

t.stop(); rt.stop();
t.reset(); rt.reset();
Expand All @@ -92,7 +92,7 @@ void two_meshes_intersection(std::string fname1, std::string fname2){
out.clear();
PMP::experimental::mixed_meshes_intersections(tm1, tm2, std::back_inserter(out));
std::cout << "number intersections: " << out.size() << std::endl;
std::cout << "Mixed intersecton time (Sequential): " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;
std::cout << "Mixed intersection time (Sequential): " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;

t.stop(); rt.stop();
t.reset(); rt.reset();
Expand All @@ -101,7 +101,7 @@ void two_meshes_intersection(std::string fname1, std::string fname2){
out.clear();
PMP::AABB_meshes_intersections(tm1, tm2, std::back_inserter(out), CGAL::parameters::concurrency_tag(CGAL::Parallel_tag()));
std::cout << "number intersections: " << out.size() << std::endl;
std::cout << "AABB intersecton time: " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;
std::cout << "AABB intersection time: " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;
std::sort(out.begin(), out.end(), [](const auto &a, const auto &b){ return a.first<b.first || (a.first == b.first && a.second<b.second); });

t.stop(); rt.stop();
Expand All @@ -111,7 +111,7 @@ void two_meshes_intersection(std::string fname1, std::string fname2){
out.clear();
PMP::AABB_meshes_intersections(tm1, tm2, std::back_inserter(out));
std::cout << "number intersections: " << out.size() << std::endl;
std::cout << "AABB intersecton time (Sequential): " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;
std::cout << "AABB intersection time (Sequential): " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;


t.stop(); rt.stop();
Expand All @@ -121,7 +121,7 @@ void two_meshes_intersection(std::string fname1, std::string fname2){
out.clear();
PMP::experimental::box_meshes_intersections(tm1, tm2, std::back_inserter(out), CGAL::parameters::concurrency_tag(CGAL::Parallel_tag()));
std::cout << "number intersections: " << out.size() << std::endl;
std::cout << "Box intersecton time: " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;
std::cout << "Box intersection time: " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;
std::sort(out.begin(), out.end(), [](const auto &a, const auto &b){ return a.first<b.first || (a.first == b.first && a.second<b.second); });

t.stop(); rt.stop();
Expand All @@ -131,7 +131,7 @@ void two_meshes_intersection(std::string fname1, std::string fname2){
out.clear();
PMP::experimental::box_meshes_intersections(tm1, tm2, std::back_inserter(out));
std::cout << "number intersections: " << out.size() << std::endl;
std::cout << "Box intersecton time (Sequential): " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;
std::cout << "Box intersection time (Sequential): " << rt.time() << "sec (" << t.time() << "s all cpu)." << std::endl;

t.stop(); rt.stop();
t.reset(); rt.reset();
Expand Down
Loading