Skip to content

Commit

Permalink
Address CGAL#8401
Browse files Browse the repository at this point in the history
  • Loading branch information
afabri committed Aug 9, 2024
1 parent ff89ba0 commit 12468cc
Show file tree
Hide file tree
Showing 23 changed files with 34 additions and 73 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ namespace Qt
{
class Callback;
class ArrangementGraphicsItemBase;
class ArrangementGraphicsItemBase;
class GraphicsViewCurveInputBase;
class GraphicsViewNavigation;
enum class CurveType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -641,8 +641,7 @@ class Arr_geodesic_arc_on_sphere_traits_2 : public Kernel_ {
* \param[in] plane the containing plane.
* \param[in] source the source-point direction.
* \param[in] target the target-point direction.
* \pre Both endpoint lie on the given plane.
* \pre Both endpoint lie on the given plane.
* \pre Both endpoints lie on the given plane.
*/
X_monotone_curve_2 operator()(const Point_2& source, const Point_2& target,
const Direction_3& normal) const
Expand Down Expand Up @@ -3113,7 +3112,7 @@ class Arr_x_monotone_geodesic_arc_on_sphere_3 {
* \param is_directed_right is the arc directed from left to right?
* \param is_full is the arc a full circle?
* \param is_degenerate is the arc degenerate (single point)?
* \pre Both endpoint lie on the given plane.
* \pre Both endpoints lie on the given plane.
*/
Arr_x_monotone_geodesic_arc_on_sphere_3
(const Arr_extended_direction_3& src,
Expand Down Expand Up @@ -3312,8 +3311,7 @@ class Arr_x_monotone_geodesic_arc_on_sphere_3 {
* \param plane the containing plane.
* \param source the source-point direction.
* \param target the target-point direction.
* \pre Both endpoint lie on the given plane.
* \pre Both endpoint lie on the given plane.
* \pre Both endpoints lie on the given plane.
*/
Arr_x_monotone_geodesic_arc_on_sphere_3
(const Arr_extended_direction_3& source,
Expand Down
1 change: 0 additions & 1 deletion BGL/test/BGL/test_Euler_operations.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ test_copy_face_graph_nm_umbrella()
T g;
Kernel::Point_3 p(0,0,0);

CGAL::make_tetrahedron(p, p, p, p, g);
CGAL::make_tetrahedron(p, p, p, p, g);

std::vector<vertex_descriptor> verts(vertices(g).begin(), vertices(g).end());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,7 @@ do_intersect(const General_polygon_with_holes_2<General_polygon_2<ArrTraits>>& p
* \param traits a traits object.
* \return `true` if `pgn1` and `pgn2` intersect in their interior and `false`
* otherwise.
* \pre `GpsTraits` must be a model of the concept `GeneralPolygonSetTraits_2`.
*
* \pre `GpsTraits` must be a model of the concept `GeneralPolygonSetTraits_2`.
*/
template <typename Polygon, typename GpsTraits>
Expand Down
12 changes: 0 additions & 12 deletions Circulator/test/Circulator/test_circ1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2380,7 +2380,6 @@ void test_circulator_from_iterator() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -2493,7 +2492,6 @@ void test_circulator_from_iterator() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -2735,7 +2733,6 @@ void test_circulator_from_iterator() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -2897,7 +2894,6 @@ void test_circulator_from_iterator() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -3308,7 +3304,6 @@ void test_circulator_from_iterator() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -3533,7 +3528,6 @@ void test_circulator_from_iterator() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -3742,7 +3736,6 @@ void test_circulator_from_container() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -3855,7 +3848,6 @@ void test_circulator_from_container() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -4097,7 +4089,6 @@ void test_circulator_from_container() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -4260,7 +4251,6 @@ void test_circulator_from_container() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -4671,7 +4661,6 @@ void test_circulator_from_container() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -4897,7 +4886,6 @@ void test_circulator_from_container() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == c);
assert( i == c);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down
10 changes: 0 additions & 10 deletions Circulator/test/Circulator/test_circ2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ void test_struct(){
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == start);
assert( i == start);
// Do I reach myself.
++i;
Struct_circulator j = i;
Expand Down Expand Up @@ -413,7 +412,6 @@ void test_struct(){
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == start);
assert( i == start);
// Do I reach myself.
++i;
Struct_const_circulator j = i;
Expand Down Expand Up @@ -651,7 +649,6 @@ void test_struct(){
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == start);
assert( i == start);
// Do I reach myself.
++i;
Struct_bi_circulator j = i;
Expand Down Expand Up @@ -809,7 +806,6 @@ void test_struct(){
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == start);
assert( i == start);
// Do I reach myself.
++i;
Struct_bi_const_circulator j = i;
Expand Down Expand Up @@ -969,7 +965,6 @@ void test_class(){
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == start);
assert( i == start);
// Do I reach myself.
++i;
Class_circulator j = i;
Expand Down Expand Up @@ -1078,7 +1073,6 @@ void test_class(){
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == start);
assert( i == start);
// Do I reach myself.
++i;
Class_const_circulator j = i;
Expand Down Expand Up @@ -1316,7 +1310,6 @@ void test_class(){
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == start);
assert( i == start);
// Do I reach myself.
++i;
Class_bi_circulator j = i;
Expand Down Expand Up @@ -1474,7 +1467,6 @@ void test_class(){
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == start);
assert( i == start);
// Do I reach myself.
++i;
Class_bi_const_circulator j = i;
Expand Down Expand Up @@ -1891,7 +1883,6 @@ void test_array() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == start);
assert( i == start);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down Expand Up @@ -2119,7 +2110,6 @@ void test_array() {
assert( ! (i == nullptr));
assert( i != nullptr);
assert( i == start);
assert( i == start);
// Do I reach myself.
++i;
Circulator j = i;
Expand Down
1 change: 0 additions & 1 deletion Combinatorial_map/include/CGAL/Combinatorial_map.h
Original file line number Diff line number Diff line change
Expand Up @@ -1780,7 +1780,6 @@ namespace CGAL {
void basic_link_beta_for_involution(Dart_descriptor adart1, Dart_descriptor adart2,
unsigned int i)
{
CGAL_assertion( i>=2 && i<=dimension );
CGAL_assertion( i>=2 && i<=dimension );
dart_link_beta(adart1, adart2, i);
dart_link_beta(adart2, adart1, i);
Expand Down
8 changes: 4 additions & 4 deletions Distance_3/test/Distance_3/test_distance_3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ struct Test
assert(are_equal(res_o2o1, expected_result));

do_intersect_check(o1, o2);
do_intersect_check(o1, o2);
do_intersect_check(o2, o1);
}

template <typename O1, typename O2>
Expand All @@ -170,7 +170,7 @@ struct Test
const FT res_o2o1 = CGAL::squared_distance(o2, o1);

do_intersect_check(o1, o2);
do_intersect_check(o1, o2);
do_intersect_check(o2, o1);

assert(res_o1o2 <= ubound);
assert(res_o2o1 <= ubound);
Expand Down Expand Up @@ -324,15 +324,15 @@ struct Test
check_squared_distance(S{p2, p3}, S{p4, p5}, 0);
check_squared_distance(S{p2, p3}, S{p5, p4}, 0);
check_squared_distance(S{p3, p2}, S{p4, p5}, 0);
check_squared_distance(S{p3, p2}, S{p4, p5}, 0);
check_squared_distance(S{p3, p2}, S{p5, p4}, 0);

const double lambda_6 = r.get_double(0, 1);
const P p6 = p3 + FT(lambda_6) * V{p3 - p2};
// [p2;p3] overlaps [p5;p6]
check_squared_distance(S{p2, p3}, S{p6, p5}, 0);
check_squared_distance(S{p2, p3}, S{p5, p6}, 0);
check_squared_distance(S{p3, p2}, S{p6, p5}, 0);
check_squared_distance(S{p3, p2}, S{p6, p5}, 0);
check_squared_distance(S{p3, p2}, S{p, p6}, 0);

const double lambda_7 = r.get_double(1, 2);
const P p7 = p3 + FT(lambda_7) * V{p3 - p2};
Expand Down
1 change: 0 additions & 1 deletion Generator/doc/Generator/CGAL/point_generators_2.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ are needed from `rnd` for each point.
\sa `CGAL::points_on_segment_2()`
\sa `CGAL::points_on_square_grid_2()`
\sa `CGAL::random_selection()`
\sa `CGAL::random_selection()`
\sa `std::random_shuffle()`

*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <CGAL/squared_distance_3.h>
#include <CGAL/number_utils.h>
#include <CGAL/Iterator_range.h>
#include <CGAL/Iterator_range.h>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/boost/graph/copy_face_graph.h>
#include <CGAL/Heat_method_3/internal/V2V.h>
Expand Down
1 change: 0 additions & 1 deletion Kernel_23/test/Kernel_23/Dimension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

#include <CGAL/Dimension.h>
#include <CGAL/Dimension.h>

template < typename K >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ void compute(SMesh* sMesh,
namespace PMP = CGAL::Polygon_mesh_processing;
typedef CGAL::Exact_predicates_inexact_constructions_kernel Epic_kernel;
typedef Epic_kernel::Point_3 Point;
typedef Epic_kernel::Point_3 Point;
typedef Epic_kernel::Vector_3 Vector;
typedef boost::graph_traits<SMesh>::vertex_descriptor Vertex_descriptor;

Expand Down
2 changes: 1 addition & 1 deletion Lab/demo/Lab/Scene_textured_surface_mesh_item.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Scene_textured_surface_mesh_item_priv::compute_normals_and_vertices(void) const
faces_buffer.resize(0);

typedef boost::graph_traits<SMesh>::face_iterator face_iterator;
typedef boost::graph_traits<SMesh>::face_iterator face_iterator;

const CGAL::qglviewer::Vec offset = static_cast<CGAL::Three::Viewer_interface*>(CGAL::QGLViewer::QGLViewerPool().first())->offset();

//Faces
Expand Down
1 change: 0 additions & 1 deletion Mesh_2/test/Mesh_2/test_meshing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include <CGAL/Delaunay_mesher_2.h>
#include <CGAL/Delaunay_mesh_face_base_2.h>
#include <CGAL/Delaunay_mesh_size_criteria_2.h>
#include <CGAL/Delaunay_mesh_size_criteria_2.h>
#include <CGAL/Delaunay_mesher_no_edge_refinement_2.h>

#include <CGAL/IO/File_poly.h>
Expand Down
2 changes: 1 addition & 1 deletion Number_types/test/Number_types/Interval_nt_new.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ int main() {
CGAL_catch_error((bool)(I<=J),CGAL::Uncertain_conversion_exception&);
CGAL_catch_error((bool)(I>=J),CGAL::Uncertain_conversion_exception&);
CGAL_catch_error((bool)(J> I),CGAL::Uncertain_conversion_exception&);
CGAL_catch_error((bool)(J> I),CGAL::Uncertain_conversion_exception&);
CGAL_catch_error((bool)(J< I),CGAL::Uncertain_conversion_exception&);
CGAL_catch_error((bool)(J>=I),CGAL::Uncertain_conversion_exception&);
CGAL_catch_error((bool)(J<=I),CGAL::Uncertain_conversion_exception&);

Expand Down
1 change: 0 additions & 1 deletion Orthtree/include/CGAL/Orthtree/Traversals.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ struct Leaves_traversal {

\tparam Tree an instance of `Orthtree`

All tree nodes at another depth are ignored. If the selected depth is
All tree nodes at another depth are ignored. If the selected depth is
higher than the maximum depth of the orthtree, no node will be traversed.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ MainWindow::loadPoints()
for (int i=0 ; i<8 ; i++) {
cx += dom[i].x();
cy += dom[i].y();
cy += dom[i].y();
cz += dom[i].z();
}
CGAL::qglviewer::Vec center(cx/8.,cy/8.,cz/8.);
viewer->setSceneCenter(center);
Expand Down Expand Up @@ -188,7 +188,7 @@ MainWindow::newPoints(int n)
for (int i=0 ; i<8 ; i++) {
cx += dom[i].x();
cy += dom[i].y();
cy += dom[i].y();
cz += dom[i].z();
}
CGAL::qglviewer::Vec center(cx/8.,cy/8.,cz/8.);
viewer->setSceneCenter(center);
Expand Down Expand Up @@ -223,5 +223,3 @@ void MainWindow::help() {
tr("Could not start Qt Assistant from %1.").arg(app));
}
}


1 change: 0 additions & 1 deletion Point_set_processing_3/include/CGAL/IO/write_off_points.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

#include <iostream>
#include <fstream>
#include <fstream>
#include <iterator>
#include <type_traits>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@
\example Polygon_mesh_processing/remesh_almost_planar_patches.cpp
\example Polygon_mesh_processing/sample_example.cpp
\example Polygon_mesh_processing/soup_autorefinement.cpp
*/

*/
Loading

0 comments on commit 12468cc

Please sign in to comment.