songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
105,231 Commits 3 Branches 156 Tags 958 MiB
Commit Graph

203 Commits

Author SHA1 Message Date
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Efi Fogel 89e6a989c4 Fixed handling endpoints of overlpping curve 2021-03-26 09:26:36 +03:00
Efi Fogel 21ba221270 Cleaned up 2021-03-25 16:00:00 +02:00
Efi Fogel 89f7d8fed0 Cleaned up 2021-03-25 15:48:49 +02:00
Efi Fogel efa642a494 Fixed curve() and boundary_touching_curve(); First examine right curves and then examine left curves 2021-03-25 15:43:48 +02:00
Efi Fogel 63e52b0bad Fix print of event on boundary (for debugging) 2021-03-25 15:42:47 +02:00
Efi Fogel 30da4ebae2 Merge remote-tracking branch 'cgal/master' into Aos_2-boundary_objects-efic 2021-03-22 13:35:23 +02:00
Laurent Rineau 7b94457cb7 Merge pull request #5313 from maxGimeno/Surface_sweep-Fix_test_script-maxGimeno 
Fix bash scripts for some tests
 2021-03-03 17:35:44 +01:00
Laurent Rineau 4e7c6ab208 Merge pull request #5313 from maxGimeno/Surface_sweep-Fix_test_script-maxGimeno 
Fix bash scripts for some tests
 2021-03-03 17:10:28 +01:00
Efi Fogel 12a85a919b Merge remote-tracking branch 'cgal/master' into Aos_2-boundary_objects-efic 2021-03-01 15:39:36 +02:00
Maxime Gimeno 48aff9e9a1 Fix indentation 2021-02-19 11:17:20 +01:00
Maxime Gimeno 1eb035085d Fix Surface_sweep_2 tests 2021-01-28 10:58:19 +01:00
Maxime Gimeno 1623097ed6 Don't force cmake options if INIT_FILE is defined 2021-01-07 13:50:56 +01:00
Efi Fogel 6b64dc8def Merge branch 'master' into Aos_2-boundary_objects-efic 2020-11-11 09:38:55 +02:00
Maxime Gimeno cc00d293df Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-11-06 09:37:18 +01:00
Laurent Rineau c45ac23ed6 Merge pull request #4899 from sgiraudot/STL_Extension-Multiset_with_CC_allocation-GF 
Surface Sweep: Enhance memory allocation with Compact Container
 2020-11-05 08:49:36 +01:00
Laurent Rineau 21c48c50dd Merge pull request #4899 from sgiraudot/STL_Extension-Multiset_with_CC_allocation-GF 
Surface Sweep: Enhance memory allocation with Compact Container
 2020-11-04 20:46:18 +01:00
Simon Giraudot 702b47790d Remove tabs 2020-11-03 08:18:07 +01:00
Simon Giraudot 0f3d0fc6d3 Safer compact container for 2020-11-02 09:29:16 +01:00
Maxime Gimeno 1c00bf6847 Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-29 15:09:16 +01:00
Laurent Rineau 1beff9f1d0 Merge remote-tracking branch 'cgal/master' into Surface_sweep_2-Small_unordered_set-GF 2020-10-29 09:33:07 +01:00
Maxime Gimeno 2ad4c16b6e Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-26 15:00:53 +01:00
Laurent Rineau d08d6ca552 Merge branch '5.1.x-branch' 2020-10-23 16:06:55 +02:00
Laurent Rineau a7cd94f82f Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' into 5.1.x-branch 2020-10-23 16:06:46 +02:00
Simon Giraudot 6b991a95ad Update code with changes in Compact container 2020-10-22 09:45:31 +02:00
Simon Giraudot c8449b29c1 Add Circulator new dependency to Surface_sweep 2020-10-22 08:59:49 +02:00
Simon Giraudot 739a8b66e8 Use named constructor to resolve ambiguity 2020-10-22 08:59:49 +02:00
Simon Giraudot 2d1afb8895 Use Compact Container to store/allocate events 2020-10-22 08:59:48 +02:00
Simon Giraudot 8710690817 Use CC allocation for multiset in surface sweep 2020-10-22 08:59:48 +02:00
Simon Giraudot 2c490b7ec7 Merge remote-tracking branch 'mine/Surface_sweep_2-Small_unordered_set-GF' into Surface_sweep_2-Small_unordered_set-GF 2020-10-20 15:17:24 +02:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Simon Giraudot 7d23ac99e2 Update internal doc from review 2020-08-17 10:26:08 +02:00
Simon Giraudot 47f3372ad9 Handle open boundary in indexed sweep (fallback to unindexed mode) 2020-08-17 10:22:03 +02:00
Simon Giraudot 901f52018c Some fixes + internal doc for indexed sweep 2020-08-13 09:52:47 +02:00
Simon Giraudot b7583f43d5 Add indexed sweep with isolated points 2020-08-13 09:19:50 +02:00
Simon Giraudot 6022a74ac8 Only use indexed sweep for curves with bottom(/top) side NOT contracted 2020-08-13 08:47:33 +02:00
Simon Giraudot acb96cba86 Get rid of index using pointer squatting + before/after functions 2020-08-12 15:56:46 +02:00
Simon Giraudot caf5b31af6 Indexed sweep in overlay (WIP: triggers assertions in some tests) 2020-08-04 15:42:26 +02:00
Simon Giraudot 9e77e501bd Add member functions for indexed sweep 2020-08-04 15:04:42 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Simon Giraudot ca794fa991 Remove now useless Curve_pair, move and fix includes/classes accordingly 2020-08-03 14:01:18 +02:00
Simon Giraudot 107d77b311 Use one small unordered set per curve instead of one global unordered set per pair 2020-08-03 13:02:13 +02:00
Efi Fogel 6642407d60 Merge remote-tracking branch 'cgal/master' into Aos_2-boundary_objects-efic 2020-07-29 18:08:32 +03:00
Efi Fogel 708469fb5e MFurther eliminating CGAL::Object 2020-06-12 14:06:58 +03:00
Laurent Rineau f4fec8c0c1 Fix C++20 errors (patch suggested by Marc Glisse) 
See https://github.com/CGAL/cgal/pull/4640#issuecomment-635200332
 2020-05-28 11:07:03 +02:00
Efi Fogel 4158542c86 Fixed intersection result 2020-04-01 12:31:51 +03:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces 
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
 2020-03-26 14:26:59 +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
Andreas Fabri 48fedbae06 Typos: splitted -> split 2019-12-11 16:57:34 +01:00
Laurent Rineau 4b7a97c702 Merge pull request #4374 from maxGimeno/4_14_Fixes-maxGimeno 
Surface_sweep_2 Fix c++11 call
 2019-12-05 11:01:08 +01:00
Maxime Gimeno e5df49fa54 Replace a nullptr by NULL 2019-11-25 16:09:00 +01:00
Efi Fogel 2a3fbc0ee8 Merge remote-tracking branch 'cgal/master' into Aos_2-boundary_objects-efic 2019-11-19 09:47:44 +02:00
Sébastien Loriot b9a079b530 remove cpp11/cpp0x 2019-11-04 11:34:53 +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 a939af4f4a Merge remote-tracking branch 'sloriot/Sweep_surface_2-derecursive_overlaps' into HEAD 2019-10-24 11:05:52 +02:00
Sébastien Loriot 0970a303e9 fix warning 2019-10-24 11:05:24 +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 7b4de1ec34 replace the function clipping last-curves at the end of overlapping curves 
There are several advantages:
- no longer use a recursive call
- only split curves if needed (because there are effectively on the right of an event)
- fix a bug when the subcurve on the right was not a subcurve of an overlapping curve
  This happens in test/construction_segments/data/test_12.txt for example where
  the curve C1 is created by doing (A+B)+C while (B+C) is then added on the right
  of the end of C1 -> with the old code (B+C) it would not be split (here X+Y means
  curve created from the overlap of curve X and Y).
 2019-10-20 12:09:18 +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
Sébastien Loriot c6736c45a9 Merge remote-tracking branch 'sloriot/Sweep_surface_2-derecursive_overlaps' into HEAD 
Conflicts:
	Installation/include/CGAL/version.h
	Maintenance/release_building/BUGFIX_NUMBER
	Maintenance/release_building/public_release_name
	Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h
 2019-10-11 07:08:59 +02:00
Sébastien Loriot 41a4f2f4a6 Merge remote-tracking branch 'sloriot/Sweep_surface_2-derecursive_overlaps' into HEAD 
Conflicts:
	Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h
 2019-10-11 07:03:44 +02:00
Sébastien Loriot 44fd43d61a opti passing the expected event 
also answer an old question from @efifogel
 2019-08-30 15:16:21 +02:00
Sébastien Loriot faec960196 fix the derecursification 
the principal change is to make sure that curves involved in an overlap
on the left of an event are split before computing new overlaps
 2019-08-30 14:27:47 +02:00
Sébastien Loriot 47b31ed273 missing renaming 2019-07-20 06:06:05 +02:00
Sébastien Loriot 338e03ef67 fix conditions 2019-07-20 05:52:22 +02:00
Sébastien Loriot adef5eb4c4 various fixes: 
- Split x-monotone curve at the event
 - test intersection with an existing curve on the right (not one that could be replaced)
 - avoid testing intersection with the same subcurve several times
 2019-07-20 05:03:35 +02:00
Sébastien Loriot 63e9884f1e inimal derecursification of overlap detectiong on the right of event 
only partial fix, full testsuite of Arrangement_on_surface_2 does not
pass
 2019-07-19 22:42:33 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +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
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
Andreas Fabri 2da23021e2 Remove some #include <CGAL/basic.h> 2019-03-28 09:18:08 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man 
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
 2019-02-14 10:32:39 +01:00
Efi Fogel 16b35aa0b2 Merge branch 'Aos_2-boundary_objects-efic-old' into Aos_2-boundary_objects-efic 2019-01-17 00:30:16 +02:00
Sebastien Loriot 727824eda6
Merge pull request #3325 from efifogel/Aos_2-fixes-efif 
Aos 2: fixes
 2018-11-14 18:50:12 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Laurent Rineau 821f9c015e Merge pull request #3311 from sloriot/Doc-Pkg_link_name 
Update the name of package names reference links
 2018-10-29 10:27:53 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0c2dcf7208 Re-add include({CGAL_USE_FILE} ) in each CMakeLists.txt where CGAL is used with some component. 2018-10-18 14:38:42 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Efi Fogel 0446b84a8c Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-10-15 12:04:37 +03:00
Sébastien Loriot 2f9408f867 rename link name to match package name 2018-10-08 10:28:55 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Laurent Rineau 8c744204de Compatibility: no -C option if INIT_FILE is unset or null 2018-09-04 11:26:33 +02:00
Maxime Gimeno bb14479266 Add -C option to all `cmake` calls in the testsuite mechanism 2018-08-24 15:11:39 +02:00
Efi Fogel a9e37b6ac6 Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-08-01 10:13:29 +03:00
Andreas Fabri f0c1d3aab7 more allocator_traits 2018-04-19 14:49:05 +01:00
Laurent Rineau 33d3abaf26 Fix compilation errors 2018-04-17 17:15:00 +02:00
Laurent Rineau 095c27e2be cosmetic changes 2018-04-17 17:14:19 +02:00
Andreas Fabri 1df9441888 Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:54:01 +01:00