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 959 MiB
Commit Graph

1238 Commits

Author SHA1 Message Date
Jane Tournois d1e79542f2 wip 2023-02-23 16:10:06 +01:00
Jane Tournois 0d550a5938 Merge remote-tracking branch 'cgal/master' into pr/janetournois/7116 
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
 2023-02-23 13:06:59 +01:00
Jane Tournois e2296b581f fix the postprocessing weights function 
add a parameter to generate_label_weights() to postprocess weights

and fix example code
 2023-02-23 10:19:40 +01:00
Jane Tournois e8e3eaa7b4 Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF 
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
 2023-02-21 11:05:30 +01:00
Mael Rouxel-Labbé ee13f77810 Various improvements 2023-02-20 10:08:21 +01:00
Andreas Fabri 545009ab7c PMP: Add np for not scaling smoothed mesh 2023-02-19 21:25:25 +00:00
Sébastien Loriot 640910288b Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-16 14:18:17 +01:00
Sébastien Loriot c1165a79aa rename named parameter 2023-02-16 11:25:23 +01:00
Laurent Rineau 166ff0fdc7 Try to fix compilation with MSVC++ 2023-02-14 13:28:07 +01:00
Sébastien Loriot fbe559adc9 Merge 'cgal/master' into PMP-decimation 2023-02-14 08:33:24 +01:00
Sébastien Loriot 7e38151479 add documentation for remeshing functions + update API 
code has not been updated yet
 2023-02-09 16:31:00 +01:00
Sébastien Loriot 9242a810c4 Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-07 11:31:55 +01:00
Laurent Rineau e8d1095526 Use Output_rep to display debug info 2023-02-06 10:00:58 +01:00
Laurent Rineau bf6d67951c Introduce Base_with_time_stamp 2023-02-06 10:00:55 +01:00
Laurent Rineau d3cbf432ec Merge pull request #7201 from GilesBathgate/General-remove_boost_lexical_string_cast-GilesBathgate 
Replace use of boost::lexical_cast<std::string> with std::to_string
 2023-02-02 10:58:17 +01:00
Sébastien Loriot 9e137bca24 Merge 'cgal/master' 2023-01-31 12:26:55 +01:00
Giles Bathgate 679ee1f870 Remove use of the safe-bool idiom, replace with explicit operator bool 2023-01-30 19:39:42 +00:00
Laurent Rineau 5f8930db8c Merge branch '5.5.x-branch' 
# Conflicts:
#	Convex_hull_2/test/Convex_hull_2/ch_test_CH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SC.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SS.cpp
#	Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
#	Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
 2023-01-27 21:16:14 +01:00
Jane Tournois 293f851f46 rename NP detect_features to features_detector 2023-01-24 12:18:17 +01:00
Giles Bathgate 22b069720a Replace use of lexical_cast<std::string> with std::to_string 
use std::prev in Plane_3_Triangle_3_intersection.h do to lack of
implicit header include.
 2023-01-15 17:23:04 +00:00
Jane Tournois 46617ad48f add input_features named parameter 
this way the user can
* detect features (on bbox and inside image),
AND
* provide his own features

WARNING : features MUST NOT overlap, or feature protection will endlessly loop
 2023-01-13 16:13:52 +01:00
Mael 4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113 2023-01-04 10:06:45 +01:00
Sébastien Loriot 2e0bc5ec99 Revert "Prevent_deref shall not return a reference to the iterator as it can be copied" 
it seems to have dramatic consequences on the runtime when using Polyhedron in test_pmp_clip
for example.

This reverts commit 7c4123152b.
 2022-12-22 17:25:58 +01:00
Sébastien Loriot f372bbe7c2 make smooth an option that is OFF by default 2022-12-19 14:35:16 +01:00
Andreas Fabri 39ebebdb5b merge master 2022-12-08 16:49:09 +00:00
Mael 0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113 2022-12-06 22:21:06 +01:00
Jane Tournois 07fb42117c add named parameters and doc 2022-12-05 15:56:56 +01:00
Laurent Rineau e8ec440859 Merge branch 'master' into Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF 
# Conflicts:
#	STL_Extension/doc/STL_Extension/CGAL/Concurrent_compact_container.h
 2022-12-05 14:51:31 +01:00
Laurent Rineau 67b5c791e9 Merge pull request #7075 from MaelRL/CGAL-Fix_some_links-GF 
Update some links + https
 2022-12-05 12:22:06 +01:00
Mael da0b13699c
Merge branch 'master' into Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF 2022-12-02 23:19:29 +01:00
Andreas Fabri 8ddf7848a0 forward call instead of duplicated code 2022-11-30 10:03:45 +00:00
Andreas Fabri 699454ae84 STL Extensions: Correct spelling 2022-11-29 13:22:00 +00:00
Andreas Fabri 7babddf443 PMP: Replace parameter with named parameter 2022-11-29 12:45:47 +00:00
Laurent Rineau 5c943e558c Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF 
Fix autotest_cgal_with_ctest
 2022-11-25 10:15:07 +01:00
Laurent Rineau b363b7e4af Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF 
Fix autotest_cgal_with_ctest
 2022-11-25 10:14:18 +01:00
Mael Rouxel-Labbé b5c21e1f5d Http -> https + update some dead links 2022-11-23 18:54:37 +01:00
Sébastien Loriot fd00ce2d02 seems that the no_parameter function is no longer needed 2022-11-21 16:02:04 +01:00
Sébastien Loriot 7322c7908d try to workaround warnings 2022-11-21 14:09:08 +01:00
Sébastien Loriot 4d797b55c4 try working around a warning 2022-11-17 19:03:30 +01:00
albert-github eed54a0ae5 spelling corrections 
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
 2022-11-15 18:45:39 +01:00
albert-github 3674c937f7 spelling corrections 
Some spelling corrections (Directories starting with `M`-` N`),
some backward work
some forward work
 2022-11-15 15:21:01 +01:00
Laurent Rineau 2e90313b07 In cpp20 namespace: CGAL::cpp20::remove_cvref 2022-11-09 10:50:01 +01:00
Jane Tournois 4ebbe922bd Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF 
# Conflicts:
#	BGL/include/CGAL/boost/parameter.h
#	Installation/CHANGES.md
#	Mesh_3/doc/Mesh_3/CGAL/Labeled_mesh_domain_3.h
#	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h

+ fix compilation
+ prepare for using detect_features
 2022-11-08 16:17:33 +01:00
Laurent Rineau 92d8d1c805 Merge remote-tracking branch 'cgal/master' into CGAL-allow_Epick_with_float-GF 
# Conflicts:
#	Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
 2022-11-08 12:11:06 +01:00
Laurent Rineau 8c9281f440 Merge pull request #6642 from sloriot/gsoc2022-boost_np 
Replace usage of Boost parameters with CGAL named function parameters
 2022-11-07 10:08:38 +01:00
Sébastien Loriot a9162809c4 fields should be taken by const ref 2022-10-31 10:18:39 +01:00
Laurent Rineau d24b180293 Merge branch 'master' into gsoc2022-boost_np 2022-10-28 15:39:36 +02:00
Laurent Rineau 51a1179d3b Add c++20 std::remove_cvref, for convenience 
@mglisse Next time you need it... it is now here.
 2022-10-28 12:07:58 +02:00
Sébastien Loriot 0cac6a9da8 Merge remote-tracking branch 'sloriot/PMP-decimation' into PMP-decimation 2022-10-25 14:55:57 +02:00
Sébastien Loriot 7c4123152b Prevent_deref shall not return a reference to the iterator as it can be copied 
iterator being taken by copy usually, if a function takes a
an iterator by copy and that function returns the reference
type of the deref operator then a reference to a temporary
will be returned.
 2022-10-24 17:58:52 +02:00
Sébastien Loriot 9179a2d41b fix conversion warning 2022-10-24 09:17:40 +02:00
Sébastien Loriot 2285a79148 fix warning 2022-10-21 09:31:03 +02:00
Sébastien Loriot 4ca779d991 fix warning 2022-10-20 11:22:40 +02:00
Sébastien Loriot 645e33aa56 fix warnings 2022-10-19 17:00:03 +02:00
Sébastien Loriot 40c1fdc03d use MSVC overload for everybody 
clang master also have issue with the generic variadic versions
 2022-10-18 06:05:13 +02:00
Andreas Fabri c04dceb71d Merge master 2022-10-14 14:40:58 +01:00
Andreas Fabri 469a0362b5 Take Laurent's review into account 2022-10-14 11:34:34 +01:00
Laurent Rineau b232f4bcfd Merge pull request #6942 from sloriot/CGAL-header_clean_up 
Clean up in headers
 2022-10-13 15:17:39 +02:00
Mael Rouxel-Labbé 2c23a6d5c5 Revert back to wrapping result_type to distinguish FT-necessary operator()s 2022-10-12 21:24:59 +02:00
Sébastien Loriot 56eb3c59e1 apply suggestions from review 2022-10-11 14:50:50 +02:00
Andreas Fabri def163afc2
Update STL_Extension/include/CGAL/assertions.h 
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
 2022-10-07 14:25:18 +02:00
Andreas Fabri fa3f8a5872 Do the test if we want to assert at runtime only when CGAL_ENABLE_DISABLE_ASSERTIONS_AT_RUNTIME is defined 2022-10-07 11:21:02 +01:00
Sébastien Loriot f3d0d76f6b add or move include guards 2022-10-06 15:35:41 +02:00
Sébastien Loriot c0ff903d21 fix default values 2022-10-05 21:41:20 +02:00
Andreas Fabri 9b357c6aff Reintroduce the runtime switch to enable/disable assrtions 2022-10-04 10:35:05 +01:00
Sébastien Loriot fc4c86a491 try to work around MSVC 2015 bugs... 2022-09-30 15:54:30 +02:00
albert-github 39c752dfd1
Update STL_Extension/include/CGAL/In_place_list.h 
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
 2022-09-29 10:32:10 +02:00
albert-github fea5528a5c STL_Extension: worng formulation of precondition 
In  STL_Extension/classCGAL_1_1In__place__list.html we see the line:
```
Both lists are increasingly sorted. A suitable operator< for the type T
```
the word `increasingly` means `more and more`, though most likely `in increasing order` is meant here
 2022-09-28 18:59:31 +02:00
Sébastien Loriot 54a6462273 move code so that we can reinject mesh_3 parameters functions into NFP class 2022-09-26 20:09:58 +02:00
Andreas Fabri d3fca65ae5 CGAL: No longer per package assertions 2022-09-23 12:49:40 +01:00
Mael Rouxel-Labbé 214e072959 Switch from RT_sufficient to FT_necessary 2022-09-22 12:02:53 +02:00
Sébastien Loriot 6b07cbdadd clean up Mesh_3 internal parameters 2022-09-21 15:45:14 +02:00
Sébastien Loriot c879db0bcd add a way to disambiguate template overloads for named parameters 2022-09-19 06:29:15 +02:00
Sébastien Loriot 0e62685f39 force images to be taken by reference 2022-09-16 14:36:06 +02:00
Laurent Rineau 4b660d9ec9 Another proposal for Filtered_predicate_RT_FT 
Instead of having the return type wrapped in a `Needs_FT` tag,
not the call operator overloads that can be called with `RT` are
"tagged" by adding a last argument of type `RT_sufficient` with a
default value.
 2022-09-07 11:10:13 +02:00
Sven Oesau 80eb8601e6
Merge branch 'CGAL:master' into Region_growing-revision-soesau 2022-09-02 16:42:41 +02:00
Laurent Rineau 2923eff641 Fix a warning `-Wnull-pointer-subtraction` 
https://clang.llvm.org/docs/DiagnosticsReference.html#wnull-pointer-subtraction
 2022-09-02 11:33:07 +02:00
Laurent Rineau 7c92341be7 Introduce CGAL_Kernel_pred_RT_or_FT 
This commit introduces a new kind of predicate in
`<CGAL/Kernel/interface_macros.h>`. In addition to
  - `CGAL_kernel_pred` for predicates,
  - `CGAL_Kernel_pred_RT` for predicates that can be implemented using a
    ring-type,

now there is also:
  - `CGAL_Kernel_pred_RT_or_FT` for predicates with multiple overloads of
    `operator()`, some needing a field type and other needing a ring type
    (without the division operator).

The C++ code can discriminate between the two cases with a special wrapper
for the return type: `CGAL::Needs_FT<result_type` instead of `result_type`
(defined in `<CGAL/tags.h>`.

In `<CGAL/Filtered_predicate.h>`, in addition to the usual class template
 `Filtered_predicate`, there is now also `Filtered_predicate_RT_FT` that
 takes three predicates as template parameters instead of two:
  - the exact predicate with an ring-type,
  - the exact predicate with a field-type,
  - the approximate predicate (with `Interval_nt` as number-type).

For the moment, only `Compare_distance_3` in
`<CGAL/Cartesian/function_objects.h>` is using the new
`Filtered_predicate_RT_FT`.

Before this commit, the file
`Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h` was testing
`Compare_distance_3` only with three points or for points. This commit adds:
  - a test with `Point_3, Point_3, Segment_3`, and
  - a test with `Line_3, Point_3, Point_3`, that actually needs a field type
    with its current implementation.

In the test `Kernel_23/test/Kernel_23/Filtered_cartesian.cpp`, the macro
`CGAL_NO_MPZF_DIVISION_OPERATOR` is defined, to remove the division operator
from `CGAL::Mpzf`. `CGAL::Mpzf` is a ring-type, even with its `operator/`
(because that `operator/` can only compute exact divisions), but with
`CGAL_NO_MPZF_DIVISION_OPERATOR` defined, that is now checked by the compiler.
 2022-09-02 11:31:47 +02:00
Laurent Rineau 59566d3fd8 Merge pull request #6800 from sloriot/SMS-test_relax_order 
SMS test relaxed order
 2022-08-29 11:35:49 +02:00
GYuvanShankar 530d6e0f78 Fixed tests not running in Mesh_3 2022-08-23 14:58:15 +05:30
Sébastien Loriot d085d7b368 use macros for compatibility 
internal code to be updated
 2022-08-19 00:55:54 +02:00
Laurent Rineau d49ee20965
Merge pull request #6665 from sloriot/CGAL-std_type_traits 2022-08-17 13:56:54 +02:00
Sébastien Loriot ad6329c263 Merge 'cgal/master' into gsoc2022-boost_np 2022-08-16 17:52:18 +02:00
Sébastien Loriot 4143d143e0 fix assertion 2022-08-16 17:23:07 +02:00
Sébastien Loriot a1525c6367 remove duplicated parameter 2022-08-05 17:03:54 +02:00
Sébastien Loriot 313c38b050 restore np removed 2022-08-05 15:29:05 +02:00
Sébastien Loriot 861588abe1 Merge 'sloriot/CGAL-std_type_traits' into master 2022-08-03 20:19:51 +02:00
Sébastien Loriot e564f4eaa5 Merge remote-tracking branch 'cgal/master' 2022-08-02 12:05:51 +02:00
GYuvanShankar 1ee7340343 Removed np for mandatory param for certain fns 2022-07-27 20:16:47 +05:30
Sébastien Loriot 7d656a0a25 Merge remote-tracking branch 'sloriot/gsoc2022-boost_np' into HEAD 2022-07-27 09:24:08 +02:00
Sébastien Loriot 347a0220b3 restrict the parameter pack to Named_function_parameters 2022-07-26 18:02:33 +02:00
Sébastien Loriot b1ee7ba78e move outside experimental namespace with a better API and doc 2022-07-26 15:06:49 +02:00
Laurent Rineau 0f7749432c Merge pull request #6412 from afabri/Triangulation_2-mark_domains-GF 
Triangulation_2: Add CGAL::mark_domain_in_triangulation
 2022-07-24 18:08:41 +02:00
GYuvanShankar 520545d543 Named parameter for mandatory parameters DRAFT 2022-07-19 13:10:35 +05:30
Sébastien Loriot b89bb215d3 WIP: removing InputRange from type definition 2022-07-18 18:04:45 +02:00
Sébastien Loriot 916e48284d add an extra overload of choose_parameter for dynamic property maps 2022-07-13 12:48:27 +02:00
Sébastien Loriot 1e857506c1 Merge remote-tracking branch 'cgal/5.5.x-branch' 2022-07-12 18:22:02 +02:00
Sébastien Loriot 12795ba29c Merge remote-tracking branch 'cgal/5.4.x-branch' into HEAD 2022-07-12 18:21:16 +02:00
Sébastien Loriot 6acb3a19fe actually the warning only shows up using clang 2022-07-12 18:18:34 +02:00
Sébastien Loriot 493795f95d also accomodate older versions of clang 2022-07-12 18:18:34 +02:00