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

95 Commits

Author SHA1 Message Date
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
Mael Rouxel-Labbé 4eeb7f1a80 Copy comparer by const& 2020-02-06 11:57:04 +01:00
Mael Rouxel-Labbé 5d1d8897b8 Fix parentheses issues 2020-01-21 22:20:29 +01:00
Mael fe0cf2574c
Use std::distance rather than arithmetic to get range size 
Co-Authored-By: Sebastien Loriot <sloriot.ml@gmail.com>
 2020-01-14 14:57:02 +01:00
Mael Rouxel-Labbé af1ae5114f Update cutoffs under which sequential version is used regardless of tag 
(after some experiments using random points in 2D/3D)
 2020-01-02 13:33:56 +01:00
Mael Rouxel-Labbé 8765e05dc8 Test that the parallel sorting gives the same result as the sequential 2020-01-02 11:17:22 +01:00
Mael Rouxel-Labbé 5c41b10d2b Clean whitespace / tabs in Spatial_sorting/include (cosmetic only) 2020-01-02 10:29:01 +01:00
Mael a6957659fd
fix CGAL_USE usage 2019-11-18 15:40:51 +01:00
Mael 287a2747e1
fix CGAL_USE usage 2019-11-18 15:40:24 +01:00
Andreas Fabri 84c4c16f70 use -> USE 2019-11-18 14:12:20 +01:00
Andreas Fabri 744413b3d5 CGAL::use() parameters 2019-11-15 08:26:01 +01:00
Andreas Fabri 914981fca6 Polish documentation 2019-11-05 11:05:12 +01:00
Andreas Fabri b98d2f6876 Fix examples 2019-11-04 16:45:30 +01:00
Andreas Fabri cffd1fe3a0 Add ConcurrencyTag 2019-11-04 15:54:47 +01:00
Andreas Fabri d7b97756ff Add 2D version 2019-11-04 12:44:13 +01:00
Andreas Fabri 4d55c22dfe Use tbb::parallel_invoke() 2019-11-04 09:09:15 +01:00
Andreas Fabri 82009f60fd Spatial_sorting: Parallelize 3D case 2019-10-30 15:40:27 +01: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 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
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Andreas Fabri 063a91a771 Use CGAL::random_shuffle 2018-04-04 14:00:23 +01:00
Andreas Fabri 6c791f161a Triangulation_2 2018-01-17 16:12:12 +00:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Laurent Rineau 2b35bddfb2 Replace all std::binary_function by CGAL::binary_function 2017-10-04 16:36:32 +02:00
Sébastien Loriot f1d5ecde05 Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch' 2017-08-22 17:21:01 +02:00
Sébastien Loriot 3f8448f280 avoid infinite loop in 3D and dD 2017-08-08 12:12:29 +02:00
Sébastien Loriot 78a07a0e69 avoid redoing the same sort if the bounds does not change 2017-08-08 11:53:44 +02:00
Jane Tournois a6c4097800 fix conversion warnings (visual 2017) 2017-02-16 13:24:51 +01:00
Laurent Rineau 8c76840812 The rnd generator return type must be the difference type 
Should fix that warning:
```
c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.10.24930\include\algorithm(1782): warning C4244: 'argument': conversion from '_Diff' to 'long', possible loss of data
c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.10.24930\include\algorithm(1796): note: see reference to function template instantiation 'void std::_Random_shuffle_unchecked<CGAL::Point_3<Kernel_>*,_RngFn>(_RanIt,_RanIt,_RngFn &)' being compiled
        with
        [
            Kernel_=CGAL::Simple_cartesian<float>,
            _RngFn=boost::random::random_number_generator<boost::random::rand48,long>,
            _RanIt=CGAL::Point_3<CGAL::Simple_cartesian<float>> *
        ]
c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.10.24930\include\algorithm(1815): note: see reference to function template instantiation 'void std::_Random_shuffle1<_RanIt,boost::random::random_number_generator<boost::random::rand48,long>>(_RanIt,_RanIt,_RngFn &)' being compiled
        with
        [
            _RanIt=std::_Vector_iterator<std::_Vector_val<std::_Simple_types<CGAL::Point_3<CGAL::Simple_cartesian<float>>>>>,
            _RngFn=boost::random::random_number_generator<boost::random::rand48,long>
        ]
C:\CGAL\test\CGAL-4.10-Ic-125\include\CGAL/spatial_sort.h(83): note: see reference to function template instantiation 'void std::random_shuffle<RandomAccessIterator,boost::random::random_number_generator<boost::random::rand48,long>&>(_RanIt,_RanIt,_RngFn)' being compiled
        with
        [
            RandomAccessIterator=std::_Vector_iterator<std::_Vector_val<std::_Simple_types<CGAL::Point_3<CGAL::Simple_cartesian<float>>>>>,
            _RanIt=std::_Vector_iterator<std::_Vector_val<std::_Simple_types<CGAL::Point_3<CGAL::Simple_cartesian<float>>>>>,
            _RngFn=boost::random::random_number_generator<boost::random::rand48,long> &
        ]
C:\CGAL\test\CGAL-4.10-Ic-125\include\CGAL/spatial_sort.h(136): note: see reference to function template instantiation 'void CGAL::internal::spatial_sort<RandomAccessIterator,Policy,Kernel>(RandomAccessIterator,RandomAccessIterator,const Kernel &,Policy,CGAL::Point_3<Kernel_> *,ptrdiff_t,ptrdiff_t,double)' being compiled
        with
        [
            RandomAccessIterator=std::_Vector_iterator<std::_Vector_val<std::_Simple_types<CGAL::Point_3<CGAL::Simple_cartesian<float>>>>>,
            Policy=CGAL::Hilbert_sort_median_policy,
            Kernel=Kernel,
            Kernel_=CGAL::Simple_cartesian<float>
        ]
C:\CGAL\test\CGAL-4.10-Ic-125\include\CGAL/spatial_sort.h(152): note: see reference to function template instantiation 'void CGAL::spatial_sort<RandomAccessIterator,CGAL::Hilbert_sort_median_policy,Kernel>(RandomAccessIterator,RandomAccessIterator,const Kernel &,Policy,ptrdiff_t,ptrdiff_t,double)' being compiled
        with
        [
            RandomAccessIterator=std::_Vector_iterator<std::_Vector_val<std::_Simple_types<CGAL::Point_3<CGAL::Simple_cartesian<float>>>>>,
            Kernel=Kernel,
            Policy=CGAL::Hilbert_sort_median_policy
        ]
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.10-Ic-125/AABB_tree/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Debug-64bits.gz
 2017-02-13 18:54:46 +01:00
Laurent Rineau 1aefb3b0f3 include <CGAL/config.h>, not <CGAL/basic.h> 2016-09-30 15:23:14 +02:00
Laurent Rineau 51f5697d3d Add missing #include 2016-09-30 15:23:14 +02:00
Laurent Rineau 4c97ab6c96 Minor fixes for -Wconversion warnings in a few packages 2016-04-22 12:36:26 +02:00
Andreas Fabri eb90e8e3e1 Include consistently <CGAL/property_map.h> 2016-02-24 12:09:36 +01:00
Sébastien Loriot a0fcac7d94 Merge branch 'Spatial_sorting-spatial_sorting_on_sphere-pmachado' of git://github.com/sloriot/cgal into sloriot-Spatial_sorting-spatial_sorting_on_sphere-pmachado 2015-04-22 17:41:53 +02:00
Sébastien Loriot e928b1e45c move spatial sorting on sphere into dedicated headers 2015-04-20 13:13:58 +02:00
Sébastien Loriot af8e2a2633 int -> size_t to avoid warning 2015-04-17 09:08:11 +02:00
Sébastien Loriot e185efc2dc update license to GPL 2015-04-16 10:55:53 +02:00
Sébastien Loriot 69a0937e9f fix initialization of static const variable of non-integral type 2015-04-16 09:17:56 +02:00
Sébastien Loriot 3c66842b77 fix compilation issues and warnings 2015-04-15 09:03:14 +02:00
Sébastien Loriot fee85470c1 Merge branch 'Triangulation_3-determinism-gf' into to-be-tested/Triangulation_3-determinism-gf 
Conflicts:
	.gitattributes
	Matrix_search/include/CGAL/rectangular_3_center_2.h
	Spatial_sorting/include/CGAL/spatial_sort.h
 2014-07-03 16:34:46 +02:00
Pedro Machado Manhães de Castro 47441076ec updating according to Monique's review; see Small Feature section 2014-03-20 10:36:03 +01:00
Pedro Machado Manhães de Castro be1de0cb54 fix bug when partial array size is 0 2014-03-07 18:49:24 +01:00
Pedro Machado Manhães de Castro 6a7cf62da8 update authors of some files 2014-03-06 18:08:00 +01:00
Pedro Machado Manhães de Castro 505532f212 fixing parameter order 2014-03-06 15:53:52 +01:00
Pedro Machado Manhães de Castro 15d098c55f Sphere_3 -> Point_3 + double, so that we don't need another traits. 2014-03-06 14:59:24 +01:00
Pedro Machado Manhães de Castro 5c95a11352 Allowing the hilbert sort on a give sphere. 2014-03-06 10:49:54 +01:00