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

Deal with duplicate lines (#8396) 

## Summary of Changes

Deal with Issue #8348 

## Release Management

* Affected package(s):  Triangulation_2 and Periodic_triangulation_2
* Issue(s) solved (if any): fix #8348 
* License and copyright ownership:  unchanged
This commit is contained in:
Sebastien Loriot 2024-08-19 11:17:50 +02:00 committed by GitHub
parent 862a3b6539 99539be5c5
commit 47c417a785
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
25 changed files with 34 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoTab.h
View File

@ -38,7 +38,6 @@ namespace Qt
{
class Callback;
class ArrangementGraphicsItemBase;
class ArrangementGraphicsItemBase;
class GraphicsViewCurveInputBase;
class GraphicsViewNavigation;
enum class CurveType;

8
Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h
View File

@ -641,8 +641,7 @@ public:
* \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
@ -3113,7 +3112,7 @@ public:
* \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,
@ -3312,8 +3311,7 @@ public:
* \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,

1
BGL/test/BGL/test_Euler_operations.cpp
View File

@ -17,6 +17,7 @@ test_copy_face_graph_nm_umbrella()
T g;
Kernel::Point_3 p(0,0,0);
// make two connected components
CGAL::make_tetrahedron(p, p, p, p, g);
CGAL::make_tetrahedron(p, p, p, p, g);

2
Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Boolean_set_operations_2.h
View File

@ -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>

12
Circulator/test/Circulator/test_circ1.cpp
View File

@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;

10
Circulator/test/Circulator/test_circ2.cpp
View File

@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;
@ -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;

1
Combinatorial_map/include/CGAL/Combinatorial_map.h
View File

@ -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);

6
Distance_3/test/Distance_3/test_distance_3.cpp
View File

@ -160,7 +160,6 @@ private:
assert(are_equal(res_o2o1, expected_result));
do_intersect_check(o1, o2);
do_intersect_check(o1, o2);
}
template <typename O1, typename O2>
@ -169,7 +168,6 @@ private:
const FT res_o1o2 = CGAL::squared_distance(o1, o2);
const FT res_o2o1 = CGAL::squared_distance(o2, o1);
do_intersect_check(o1, o2);
do_intersect_check(o1, o2);
assert(res_o1o2 <= ubound);
@ -324,7 +322,7 @@ private:
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};
@ -332,7 +330,7 @@ private:
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{p5, p6}, 0);
const double lambda_7 = r.get_double(1, 2);
const P p7 = p3 + FT(lambda_7) * V{p3 - p2};

1
Generator/doc/Generator/CGAL/point_generators_2.h
View File

@ -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()`
*/

1
Heat_method_3/include/CGAL/Heat_method_3/internal/Intrinsic_Delaunay_triangulation_3.h
View File

@ -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>

1
Kernel_23/test/Kernel_23/Dimension.cpp
View File

@ -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 >

1
Lab/demo/Lab/Plugins/PMP/Interpolated_corrected_principal_curvatures_plugin.cpp
View File

@ -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;

2
Lab/demo/Lab/Scene_textured_surface_mesh_item.cpp
View File

@ -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

1
Mesh_2/test/Mesh_2/test_meshing.cpp
View File

@ -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>

2
Number_types/test/Number_types/Interval_nt_new.cpp
View File

@ -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&);

1
Orthtree/include/CGAL/Orthtree/Traversals.h
View File

@ -143,7 +143,6 @@ public:
\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.

6
Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.cpp
View File

@ -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);
@ -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);
@ -223,5 +223,3 @@ void MainWindow::help() {
tr("Could not start Qt Assistant from %1.").arg(app));
}
}

2
Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h
View File

@ -931,7 +931,7 @@ public:
CGAL_assertion(this->int_to_off(offsets[i])[0] == 0 || this->int_to_off(offsets[i])[0] == 1);
CGAL_assertion(this->int_to_off(offsets[i])[1] == 0 || this->int_to_off(offsets[i])[1] == 1);
CGAL_assertion(this->int_to_off(offsets[i])[1] == 0 || this->int_to_off(offsets[i])[1] == 1);
CGAL_assertion(this->int_to_off(offsets[i])[2] == 0 || this->int_to_off(offsets[i])[2] == 1);
}
c->set_offsets(offsets[0], offsets[1], offsets[2], offsets[3]);

1
Point_set_processing_3/include/CGAL/IO/write_off_points.h
View File

@ -25,7 +25,6 @@
#include <iostream>
#include <fstream>
#include <fstream>
#include <iterator>
#include <type_traits>

2
Polygon_mesh_processing/doc/Polygon_mesh_processing/examples.txt
View File

@ -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
*/
*/

1
Surface_mesh_shortest_path/examples/Surface_mesh_shortest_path/shortest_paths_multiple_sources.cpp
View File

@ -6,7 +6,6 @@
#include <boost/lexical_cast.hpp>
#include <cstdlib>
#include <cstdlib>
#include <iostream>
#include <fstream>

1
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Common.h
View File

@ -29,7 +29,6 @@
#include <functional>
#include <utility>
#include <vector>
#include <vector>
#include <set>
namespace CGAL {

1
Triangulation_2/doc/Triangulation_2/Concepts/DelaunayTriangulationTraits_2.h
View File

@ -26,7 +26,6 @@ required if the method `nearest_vertex()` is used.
\cgalHasModelsBare{All models of the \cgal concept `Kernel`}
\cgalHasModelsBare{`CGAL::Projection_traits_3<K>` (not for dual Voronoi functions)}
\cgalHasModelsBare{`CGAL::Projection_traits_xy_3<K>` (not for dual Voronoi functions)}
\cgalHasModelsBare{`CGAL::Projection_traits_xy_3<K>` (not for dual Voronoi functions)}
\cgalHasModelsBare{`CGAL::Projection_traits_yz_3<K>` (not for dual Voronoi functions)}
\cgalHasModelsBare{`CGAL::Projection_traits_xz_3<K>` (not for dual Voronoi functions)}
\cgalHasModelsEnd

1
Triangulation_2/include/CGAL/Triangulation_2/insert_constraints.h
View File

@ -84,7 +84,6 @@ namespace CGAL {
ConstraintIterator first,
ConstraintIterator beyond)
{
typedef typename T::Point Point;
typedef typename T::Point Point;
std::vector<Point> points;
for (ConstraintIterator s_it=first; s_it!=beyond; ++s_it)