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

344 Commits

Author SHA1 Message Date
Simon Giraudot 764fa731ee Merge remote-tracking branch 'mine/BGL-Alpha_expansion_graphcut-GF' into BGL-Alpha_expansion_graphcut-GF 2020-01-15 13:45:30 +01:00
Laurent Rineau 0fa0c4fbb9 Merge pull request #4244 from maxGimeno/AABB_tree-Make_accelerate_distance_queries_default-maxGimeno 
AABB_tree: make accelerate distance queries default
 2019-12-05 11:05:35 +01:00
Sébastien Loriot 2c17ec76fd relicense to GPL-3+ (allowed since it is GPL-2+ originally) 2019-10-20 00:41:40 +02:00
Sébastien Loriot c4c1a0b317 Remove license notice in headers manually 2019-10-19 16:00:05 +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
Laurent Rineau dd734e3098 Merge pull request #4283 from sloriot/SMSeg-more_robust 
Be more robust to degenerate and almost degenerate faces
 2019-10-15 16:31:33 +02:00
Sébastien Loriot 15a546084c be more robust to degenerate and almost degenerate faces 2019-10-10 17:22:19 +02:00
Maxime Gimeno dd566a2c96 Fixes 2019-09-24 13:49:10 +02:00
Maxime Gimeno a52592909f Remove all calls to accelerate_distance_queries(), now redundant. 2019-09-24 11:44:20 +02: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
Simon Giraudot 475e9fdec6 Update with reviews 2019-07-25 09:16:16 +02:00
Simon Giraudot b062907334 Propagate API change to classification and segmentation 2019-07-23 09:21:31 +02:00
Simon Giraudot c06c778ca9 Move MaxFlow back to segmentation and fix documentation 2019-07-23 09:21:20 +02:00
Simon Giraudot 497c121e55 Finalize API of alpha expansion + doc 2019-07-23 08:43:17 +02:00
Simon Giraudot f0df168096 Merge all three versions with one unique function + separate calls 2019-07-23 08:43:17 +02:00
Simon Giraudot 4cd9282f79 Start working on public API for alpha expansion 2019-07-23 08:43:01 +02:00
Simon Giraudot 5ca8fcf47b Make Boost Alpha Expansion use BGL API 2019-07-23 08:40:25 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +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 a2075494da Move trace.h 2019-04-08 16:16:49 +02:00
Sébastien Loriot 0685423ae8 update from cgal/master 2018-11-02 11:32:31 +01:00
Sébastien Loriot 2f9408f867 rename link name to match package name 2018-10-08 10:28:55 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Andreas Fabri 827e9fee8e fix Segmentation 2018-05-04 09:00:09 +02:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Andreas Fabri f723c527e1 Surface_mesh_shortest_path 2018-01-17 21:56:19 +00:00
Simon Giraudot 1b25f47f95 Small bugfix (stop criteria if flow goes to 0) 2018-01-12 14:15:00 +01:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Sébastien Loriot 5ea5bc95fd make maxflow header compatible with the license checking mecanism 2017-11-12 10:21:35 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 0b97c247bf update macro names and undef them when leaving the file 2017-09-20 16:47:53 +02:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files 
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
 2017-01-19 15:20:25 +01:00
Laurent Rineau cfc0ac01c3 Merge pull request #1699 from sloriot/SMSeg-match_concepts 
Update code to match documented concepts
 2016-12-02 11:35:48 +01:00
Sébastien Loriot a619107eeb property maps are readable property maps not lvalue 2016-11-18 07:54:57 +01:00
Sébastien Loriot e17cabba90 use BGL helper free function is_triangle_mesh instead of a member one 2016-11-18 07:52:40 +01:00
Andreas Fabri 423242be31 dihedral_angle() -> approximate_dihedral_angle() 2016-10-11 15:35:20 +02:00
Laurent Rineau 42c0fc3c46 Missing includes 2016-09-30 15:23:15 +02:00
Andreas Fabri c58582b5ec Add global function dihedral_angle() 2016-09-30 15:23:15 +02:00
Maxime Gimeno d2e6c0e9fa Fix 
- Use get() instead of [] operator to access the VertexPointMap.
 2016-06-10 09:16:11 +02:00
Maxime Gimeno 90f04ba221 Fix runtime errors induced by insert(Primitive()) 2016-05-27 12:14:38 +02:00
Maxime Gimeno 110464b045 Update the concept SegmentationGeomTraits to require Collinear_3 functor. Update the code accordingly. 2016-05-24 16:15:43 +02:00
Maxime Gimeno 8b34294c82 AABB_Tree ignores degenerated faces in SDF_Calulation 2016-05-24 10:17:41 +02:00
Sébastien Loriot 266812b165 use segment intersection by default as it is faster in general than ray casting 2016-04-26 17:12:18 +02:00
Sébastien Loriot 5df0fd7e4f handle when the ray intersect a triangle as a segment 
same handling as above: ignored
 2016-04-26 17:12:18 +02:00
Sébastien Loriot b90f3301e8 rename functions for ray casting and add comments 2016-04-26 17:12:18 +02:00
Sébastien Loriot 39336ebb34 remove debugging function 2016-04-26 17:12:18 +02:00
Sébastien Loriot 4f8c3adb71 use variant API instead of the Object one for intersection 2016-04-26 17:12:17 +02:00
Sébastien Loriot 2f20d4a036 assert -> CGAL_assertion 2016-04-26 17:12:17 +02:00
Sébastien Loriot 6b8421a048 update function name 2016-04-26 17:12:17 +02:00
Sébastien Loriot a0b97b23fb use the variant API instead of the Object one 2016-04-26 17:12:16 +02:00
Philipp Möller 649fabe67b Do not use debug variant 2016-04-26 17:11:08 +02:00
Philipp Möller a408a08ae7 fixup debug code 2016-04-26 17:11:05 +02:00
Philipp Möller 70f8f3f8e1 Use skip functor 2016-04-26 17:11:00 +02:00
Philipp Möller e7bf221b61 Order code in cast_and_return for less constructions 2016-04-26 17:10:56 +02:00
Philipp Möller de28e712f4 Work around skip functor 
We cannot support a skip functor in ray_intersection and we have to work
around the issue of the ray starting inside a facet. To do that we shift
the source of the ray by the epsilon of a floating point number. We have
to consider if we really want to keep it that way.

Add assertions to make sure the new and old code give the same results.
 2016-04-26 17:10:50 +02:00
Philipp Möller 5f2ea0c9f4 Don't use diagonal 2016-04-26 17:10:49 +02:00
Philipp Möller 815a82c692 Shim in code for ray_intersection 
Use ray_intersection in the !use_diagonal case. Calculate both methods
for now for debugging.
 2016-04-26 17:10:48 +02:00
Sébastien Loriot 312d4cb553 Uniformize names of template parameters and graph in segmentation package 2016-02-10 18:39:48 +01:00
Sebastien Loriot 49e7ea6f58 Merge pull request #680 from sloriot/SMS-boost_1.60 
Surface mesh segmentation: boost 1.60 compatibility
 2016-01-27 13:39:12 +01:00
Sébastien Loriot 5614ed7500 replace ice_and by && 
ice_and was deprecated in boost 1.60
 2016-01-26 09:31:47 +01:00
Simon Giraudot a95c68e804 Merge branch 'CGAL-Fix_several_warnings-GF-old' into CGAL-Fix_several_warnings-GF 2015-12-28 14:13:00 +01:00
Simon Giraudot fe1ac9e86c Warning fix: uninitialized attributes 2015-12-18 14:44:17 +01:00
Simon Giraudot f21cb46900 Remove deprecated "register" keyword 2015-12-17 08:20:56 +01:00
Andreas Fabri 6706cc58c4 include header which pragma pushes a warning 2015-11-13 09:47:25 +01:00
Andreas Fabri 1d2f26ea3c Functions must be written with '()' 
Approved by the release manager
 2015-02-10 15:51:01 +01:00
Sébastien Loriot 21a705cdd9 do not use default template parameters 2014-12-23 14:59:00 +01:00
Laurent Rineau 36d8b5bd18 Convert source files encoding to utf-8 
All non-ASCII files should be encoded in UTF-8. So far, the ZSH script
`Scripts/developer_scripts/detect_wrong_encoding` detects wrong encoding
in source/header files of include/, src/, and doc/.
 2014-08-01 11:20:13 +02:00
Sébastien Loriot ec13e3ed94 segmentation requires a model of FaceListGraph 2014-07-04 13:55:52 +02:00
Sébastien Loriot 79a746f7d9 remove an unused internal function 
intel compilier with strict-ansi does not like it
  because even if it is not called, it is invalid as
  a const ref is not initialized
 2014-07-03 15:14:40 +02:00
Sébastien Loriot ddbeb9d017 pass the vertex point property map to the AABB-tree and the primitive 2014-07-02 10:57:05 +02:00
Sébastien Loriot 1555c034e7 use the member traits class and not the default constructed one 2014-07-02 10:51:23 +02:00
Sébastien Loriot 271cab1134 change the order of template parameter for segmentation 
the order is imposed by the default
  note this breaks the compatibility when the traits class was explicitly given
 2014-07-01 16:43:27 +02:00
Sébastien Loriot a6e7d9cfd4 add missing back quotes 2014-06-11 14:20:51 +02:00
Sébastien Loriot b84d131b92 segmentation requires a model of FaceGraph 2014-06-11 14:20:05 +02:00
Andreas Fabri bbf70667bd bug fix 2014-06-11 12:37:04 +02:00
Andreas Fabri d92d0cef84 Use CGAL points even for OpenMesh 2014-06-10 15:26:06 +02:00
Sébastien Loriot db346b1ad3 add extra overload if c++11 is not enabled 2014-06-06 15:36:27 +02:00
Sébastien Loriot aec7e99e6a introduce the point property map 2014-06-05 21:24:34 +02:00
Sébastien Loriot 8b88547955 fix compilation issues 2014-06-05 17:01:59 +02:00
Andreas Fabri ffc619f871 edges was at the same time a local variable 2014-06-05 16:21:16 +02:00
Andreas Fabri 84208ee628 constness problems with CGAL::Polyhedron_3. The problem with edges(G) persists :< 2014-06-05 16:12:03 +02:00
Andreas Fabri 3d7d596e6b Use vertex_point property map so that it now also compiled with OpenMesh 2014-06-05 15:29:49 +02:00
Andreas Fabri 2c4c38809d switch internally to BGL API in mesh segmentation. We still have to deal with the point property maps 2014-06-05 12:05:54 +02:00
Andreas Fabri 4a37f74122 switch to new BGL API 2014-06-04 21:28:59 +02:00
Sébastien Loriot 4a115d7655 trivial bug-fix for master: fix namespace 2014-04-22 16:35:18 +02:00
Laurent Rineau fd70ee758c Fix license of Surface_mesh_segmentation headers 
The package is copyright GeometryFactory, and published under license
GPLv3+.

The file <CGAL/internal/auxiliary/graph.h> is a special case: it is
owned by an external (Yuri Boykov) and was released under GPLv2+. That
means than we can relicense it to GPLv3+.
 2014-02-06 18:36:21 +01:00
Sébastien Loriot d481ded8ba use timers in graph cut only if CGAL_SEGMENTATION_BENCH_GRAPHCUT is defined 2014-01-08 10:25:48 +01:00
Sébastien Loriot 3a0853a27b fix warnings 2013-12-23 16:49:47 +01:00
Sébastien Loriot ad44ab3a92 remove compilation warnings 2013-12-23 16:49:46 +01:00
Sébastien Loriot 61c91a1971 turn int to std::size_t when it is possible 2013-12-23 16:49:46 +01:00
Sébastien Loriot 5a6523ac86 fix a warning in MAXFLOW 
warning: dereferencing type-punned pointer will break strict-aliasing rules
 2013-12-23 16:49:45 +01:00
Sébastien Loriot 6fc429f1de fix warnings in MAXFLOW 2013-12-23 16:49:44 +01:00
Sébastien Loriot e54a0e758e turn number_of_center from int to std::size_t 2013-12-23 16:49:44 +01:00
Sébastien Loriot 7cf48beb41 int -> size_t to remove warnings 2013-12-23 16:49:44 +01:00
Sébastien Loriot dd485f4839 add empty line at the end of the files to remove a warning 2013-12-23 16:49:44 +01:00