Commit Graph

1783 Commits

Author SHA1 Message Date
Ahmed Essam 30104c6032 Fix bug in matching roots 2020-03-27 08:34:04 +01:00
Sébastien Loriot 97e46accad extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:26:37 +01:00
Sébastien Loriot 34ce87be56 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:26:15 +01:00
Sébastien Loriot 180c06146f Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:10:41 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Sébastien Loriot 2419170514 be resilient to the absence of trailing whitespace in input 2020-03-26 13:24:27 +01:00
Ahmed Essam a7eb7cfe04 Fix bug in point_position in the brazier traits 2020-03-12 23:14:42 +02:00
Guillaume Damiand 5c9bb6f016 Rename PTR into PTR.p following the modifs in Handle.h 2020-02-14 11:30:56 +01:00
Sébastien Loriot c662a59645 avoid a construction
this helps the sweep working with EPICK in case no
new construction are needed
2019-11-26 17:00:59 +01:00
Laurent Rineau 092cf8e2c5 Merge pull request #4284 from sloriot/Sweep_surface_2-derecursive_overlaps_5.0
Derecursification of overlaps detection on the right of event - [5.X]
2019-10-25 16:26:17 +02:00
Sébastien Loriot 47c092557f Merge remote-tracking branch 'sloriot/Sweep_surface_2-derecursive_overlaps' into HEAD 2019-10-21 13:04:25 +02:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Sébastien Loriot 90b199b952 fix typos 2019-10-18 09:40:01 +02:00
Laurent Rineau 13beab6ae3 Merge pull request #4278 from sloriot/AOS_2-Trapezoid_map_fixes
Trapezoid map fixes
2019-10-16 18:18:30 +02:00
Laurent Rineau 7143b69bb1 fix warning
```
include/CGAL/Arr_point_location/Td_active_trapezoid.h:98:10: warning: class Non_recursive_td_map_item_destructor was previously declared as a struct [-Wmismatched-tags]
  friend class internal::Non_recursive_td_map_item_destructor<Traits>;
         ^
```
2019-10-16 18:18:01 +02:00
Laurent Rineau e81a805cf6 Merge pull request #4278 from sloriot/AOS_2-Trapezoid_map_fixes
Trapezoid map fixes
2019-10-15 16:33:29 +02:00
Sébastien Loriot 770da55188 Prevent recursive calls to ~Handle while clearing the dag or removing elements in the dag 2019-10-09 18:15:31 +02:00
Sébastien Loriot 9694f5b1ce avoid extra call to random_shuffle 2019-10-08 18:10:26 +02:00
Sébastien Loriot f3092b5438 hide debug info 2019-10-08 18:01:05 +02:00
Sébastien Loriot 11b865e4e4 remove duplicate halfedges before rebuild
a halfedge can be associated to several nodes in the dag
(since a halfedge can contribute to several trapezoids)
2019-10-08 17:14:13 +02:00
Sébastien Loriot 678811cdde fix typo 2019-10-08 17:13:36 +02:00
Sébastien Loriot b2eb6a405b fix cw update
direction is not a good criteria, especially for dangling edges
2019-10-07 16:00:18 +02:00
Sébastien Loriot 08a3411d85 fix the update of cw halfedge of active vertex after update
cw source must be v and cw is the first halfedge seen from noon
when using cw order
2019-10-07 15:58:42 +02:00
Efi Fogel be96223d8e Fixed discrepancy between traits and subcurve-traits in the polycurve basic traits. 2019-09-18 13:20:17 +03:00
Efi Fogel ea6b70dfbc Down casted a variable of type Point_2 (extended direction) to the Kernel::Direction_2 type, so that it can be passed to kernel functors. 2019-09-18 13:19:30 +03:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Sebastien Loriot 2a426bb1e1
Merge pull request #4063 from sloriot/CGAL-NO_CXX11
Remove CGAL_CXX11 macro usage
2019-07-19 16:16:22 +02:00
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
match @{ and @}
2019-07-18 16:26:43 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau 7b0c6f0cf7 Fix a stack-use-after-scope in Arr_polycurve_basic_traits_2
Before this patch, `Arr_polycurve_basic_traits_2` was holding a const
reference to a temporary object.

Here was the result of ctest, with the address sanitizer:
```shellsession
$ make && ASAN_OPTIONS=detect_leaks=0 ctest -L Arr -j6
[...]
The following tests FAILED:
        144 - execution___of__generic_curve_data (Failed)
        170 - execution___of__polycurve_circular_arc (Failed)
        172 - execution___of__polycurve_conic (Failed)
        176 - execution___of__polycurves_basic (Failed)
        178 - execution___of__polylines (Failed)
        2166 - test_traits_test_polylines__data_polylines_compare_y_at_x__polyline_traits (Failed)
        2168 - test_traits_test_polylines__data_polylines_intersect__polyline_traits (Failed)
        2169 - test_traits_test_polylines__data_polylines_split__polyline_traits (Failed)
        2171 - test_traits_test_polylines__data_polylines_assertions__polyline_traits (Failed)
        2175 - test_traits_conic_polycurve__data_polycurves_conics_compare_y_at_x__polycurve_conic_traits (Failed)
        2176 - test_traits_conic_polycurve__data_polycurves_conics_compare_y_at_x_left__polycurve_conic_traits (Failed)
        2177 - test_traits_conic_polycurve__data_polycurves_conics_compare_y_at_x_right__polycurve_conic_traits (Failed)
        2179 - test_traits_conic_polycurve__data_polycurves_conics_intersect__polycurve_conic_traits (Failed)
        2180 - test_traits_conic_polycurve__data_polycurves_conics_split__polycurve_conic_traits (Failed)
        2193 - test_traits_circular_arc_polycurve__data_Polycurves_circular_arcs_compare_y_at_x__polycurve_circular_arc_traits (Failed)
        2198 - test_traits_circular_arc_polycurve__data_Polycurves_circular_arcs_split__polycurve_circular_arc_traits (Failed)
        2221 - test_traits_non_caching_polylines__data_polylines_compare_y_at_x__non_caching_polyline_traits (Failed)
        2223 - test_traits_non_caching_polylines__data_polylines_intersect__non_caching_polyline_traits (Failed)
        2224 - test_traits_non_caching_polylines__data_polylines_split__non_caching_polyline_traits (Failed)
        2226 - test_traits_non_caching_polylines__data_polylines_assertions__non_caching_polyline_traits (Failed)
        2400 - execution___of__test_construction_polylines (Failed)
        2477 - execution___of__test_io (Failed)
```

This is fixed rather easily, by copying the traits class, instead of
holding a reference to it.
2019-06-18 15:18:15 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Laurent Rineau b8fe6b10ee Merge pull request #3804 from afabri/CGAL_tests_must_not_include_basic-GF
Do not include <CGAL/basic.h>
2019-05-21 16:37:01 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau 2f8eeb0db3 Fix the headers dependency-hell around gmpxx in Number_types 2019-05-09 15:05:23 +02:00
Sébastien Loriot 4464229a52 remove cpp11 workarounds in argt related packages 2019-03-29 10:41:50 +01:00
Andreas Fabri dcb6c1478c Fix Arrangement_2 2019-02-08 08:57:43 +01:00
Andreas Fabri cc23699ea0 fix Arrangement_2 2019-01-28 09:14:59 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Andreas Fabri 0496d840ff Fix arrangement and lcc 2019-01-18 10:05:48 +01:00
Andreas Fabri 303aaa04ae Fix arrangement 2019-01-15 19:18:53 +01:00
Andreas Fabri de14c487da Fix Arrangement 2019-01-10 18:52:35 +01:00
Efi Fogel ace09977af Cleaned up the code 2019-01-02 12:22:58 +02:00
Efi Fogel 6d6c2f3717 Fixed initializer
with workaround for the absense of c++11 auto feature--added facets properly.
2018-11-30 10:09:31 +01:00
Efi Fogel 1d36c090ec Replaced c++11 feature with non-c++11 code. 2018-11-03 20:03:12 +02:00
Sébastien Loriot 9223c1b28e fix warnings 2018-11-01 12:52:02 +01:00
Efi Fogel 5afbc4985a Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-10-06 18:36:51 +03:00
Efi Fogel c0fc218fdf Implemented missing function object Compare_x_near_boundary_2. 2018-09-09 16:51:55 +03:00
Efi Fogel 5e7b21da7c Fixed API of surface builder 2018-09-09 14:39:56 +03:00
Efi Fogel 678e0b7066 Cleaned up and completed the implementation of Compare_xy of two curves. 2018-09-09 09:16:02 +03:00
Efi Fogel 0a94f758f8 Added Compare_xy_2 operator for 2 cx-monotone curves 2018-09-06 07:40:09 +03:00
Efi Fogel 949c118f03 Fixed computing the zone on a curve with an endpoint on the boundary. Introduced generic do_overlap() & is_between_cw(). 2018-09-06 07:37:46 +03:00
Efi Fogel 2187738873 Introduced do_overlap() and is_between_cw() 2018-09-06 07:35:43 +03:00
Efi Fogel e2fb25e2c0 Cleaned up comments 2018-09-04 16:08:03 +03:00
Efi Fogel 7a4e740991 Fixed handling dual arrangements. Instead of including a header file several times, define some macros and call them several times. 2018-09-01 19:44:52 +03:00
Sébastien Loriot 12651796a0 use a generic file with the argt class name being a macro
since several free functions needs to be defined, it seems
to be the simplest and cleanest solution
2018-08-28 10:35:46 +02:00
Sébastien Loriot f96854a359 cleaning up + also use the mechanism for Arrangement_2 2018-08-27 15:46:12 +02:00
Sébastien Loriot 348345a482 add missing specialization 2018-08-27 10:03:52 +02:00
Sébastien Loriot 085bfb0aef first try to make Dual working with Argt_with_history 2018-08-27 09:26:45 +02:00
Efi Fogel 66258c7d33 Cleaned up. In particular added 'm_' suffix to data member names. 2018-08-01 15:48:11 +03:00
Efi Fogel a9e37b6ac6 Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-08-01 10:13:29 +03:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 6283291c8a Moved CGAL::iterator to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Laurent Rineau ed3df2366e Merge pull request #3109 from psarahdactyl/master
add missing const to compare_endpoints_xy_2 () operator taking x-mono…
2018-06-06 14:39:16 +02:00
Laurent Rineau 089e0c10ce Merge pull request #3093 from efifogel/Aos_2-ric_remove_edges-efif
Aos 2 ric remove edges efif

# Conflicts:
#	Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt
2018-05-28 13:58:28 +02:00
Efi Fogel 8631b3c09f Fixed a warning about an unsed variable. 2018-05-25 13:21:42 +03:00
sarahanne 078aa22839 add missing const to compare_endpoints_xy_2 () operator taking x-monotone-curve as a parameter 2018-05-22 15:23:16 -04:00
Efi Fogel 224a500ec7 Called locate_opt_empty() after the removal of an edge to reset the hint. Introduced update_vtx_cw_he_after_remove() and called it to update the cw halfedge of an active vertex when a halfedge is removed. 2018-05-16 17:52:15 +03:00
Efi Fogel 343ca15477 Introduced set_cw_he_visitor() member function 2018-05-16 17:49:02 +03:00
Efi Fogel 06d2fc762a Introduced member function reset_cw_he() 2018-05-16 17:48:15 +03:00
Efi Fogel d5a26a0bc0 Cleaned up; stage 2 2018-05-16 11:21:07 +03:00
Sebastien Loriot fe262d6215
Merge pull request #3085 from afabri/Arrrangement_2-static_or_atomic-GF
Arrangement_2: Address all remaining points of issue #1384, but the renderer
2018-05-16 08:46:18 +02:00
Efi Fogel 972cede312 Cleaned up, stage 1. 2018-05-16 08:37:27 +03:00
Andreas Fabri 99bc374cce More forward declarations 2018-05-15 15:37:51 +02:00
Andreas Fabri 5690cc4a02 Arrangement_2: Add Forward Declaration 2018-05-15 15:37:51 +02:00
Andreas Fabri b984dce222 Address all remaining points of issue #1384, but the renderer 2018-05-11 08:32:11 +01:00
Efi Fogel 37ff684b6f Uncommented a necessary call to update the container of the curves when rebuilding 2018-05-06 15:54:46 +03:00
Laurent Rineau abea1b9cb6 Merge pull request #3028 from sloriot/Argt-missing_const
Add missing const
2018-04-24 17:33:30 +02:00
Laurent Rineau 81cfcf722d
Indentation 2018-04-23 13:26:50 +00:00
Laurent Rineau 1e1025e604
Fix the indentation!! 2018-04-23 13:09:34 +00:00
Andreas Fabri d7a4a4ac49 Use decltype 2018-04-21 09:41:23 +01:00
Andreas Fabri f0c1d3aab7 more allocator_traits 2018-04-19 14:49:05 +01:00
Laurent Rineau 095c27e2be cosmetic changes 2018-04-17 17:14:19 +02:00
Sébastien Loriot e0d0599949 add missing const 2018-04-17 16:01:35 +02:00
Andreas Fabri 97ac4d5f51 Exploit that construct is variadic 2018-04-17 14:15:07 +01:00
Andreas Fabri 7cbffac35b Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:35:04 +01:00
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Efi Fogel ebe16ef2f8 Added missing definition of a constructor in compare-cy 2018-04-07 16:03:58 +03:00
Efi Fogel 5b35b2fb6e Added missing const 2018-04-07 16:03:32 +03:00
Andreas Fabri 063a91a771 Use CGAL::random_shuffle 2018-04-04 14:00:23 +01:00