Laurent Rineau
d49ee20965
Merge pull request #6665 from sloriot/CGAL-std_type_traits
2022-08-17 13:56:54 +02:00
Sébastien Loriot
861588abe1
Merge 'sloriot/CGAL-std_type_traits' into master
2022-08-03 20:19:51 +02:00
Andreas Fabri
001f9b8c43
Change macro name
2022-08-03 11:35:00 +01:00
Andreas Fabri
349f9ac384
Fix link
2022-08-02 16:01:43 +01:00
Andreas Fabri
b52d211824
Parameterization: Scope name of a #define
2022-08-02 09:27:01 +01:00
Sébastien Loriot
decab153bb
Merge pull request #6716 from afabri/Parameterization-iterative_authalic_performance-GF
...
Parameterization: Make Iterative_authalic_parameterization faster (WIP)
2022-08-01 15:54:38 +02:00
Sven Oesau
d98076bba6
removed protected copy_sparse_matrix as it is no longer required when the matrix type is assignable
2022-07-29 15:44:24 +02:00
Laurent Rineau
561cc66264
Backport the patch of pull request #6602 from lrineau/Triangulation_2-fix_cdt_2-GF
...
Try to fix CDT_2 with inexact construction of intersections
2022-06-29 12:30:35 +02:00
Andreas Fabri
7fd9f8c887
Fix debug #define
2022-06-27 15:11:54 +01:00
Andreas Fabri
a28f8f553d
Parameterization: Make Iterative_authalic faster (WIP)
2022-06-27 15:03:20 +01:00
Sébastien Loriot
ac8b6d4731
boost::is_same --> std::is_same
2022-06-10 08:18:20 +02:00
Sébastien Loriot
4f5f8341cc
use std::enable_if_t
2022-06-10 07:37:53 +02:00
Laurent Rineau
686ef28284
update dependencies: Add Arithmetic_kernel and Cartesian_kernel
2022-06-02 17:12:44 +02:00
Sebastien Loriot
269a391fa0
Merge pull request #6558 from lrineau/Installation-remove_wd4503-GF
...
CMake script updates: version of CMake and /wd4503 is only for MSVC 2015
2022-05-13 15:53:36 +02:00
Laurent Rineau
2288225448
Massive update of CMake policies to version 3.23
2022-05-06 09:34:35 +02:00
Andreas Fabri
7c207526f8
Add parameterization
2022-05-04 17:38:32 +01:00
Laurent Rineau
258d704a90
Merge pull request #6209 from sloriot/PMP-std_instead_of_boost
...
Use features available in std instead of boost
2022-02-24 19:57:17 +01:00
Sébastien Loriot
4ffc949199
replace boost::unordered by std::unordered
...
but in T3, Mesh_3, TDS_3, P3[TM]3
2022-02-03 19:11:12 +01:00
Andreas Fabri
440a8dfb7b
Fix file name
2022-02-03 08:41:04 +00:00
Andreas Fabri
735752bec9
Do the remaining changes after Laurent's check
2022-02-03 08:02:11 +00:00
Sébastien Loriot
6d3176e061
move Named_parameters class in STL_extension
...
helpers stay in BGL because it depends on BGL tags
2022-01-07 15:12:22 +01:00
Sébastien Loriot
047ddad86c
remove optional parameter
2022-01-04 10:12:37 +01:00
Laurent Rineau
373d21e1d8
Merge pull request #6177 from MaelRL/SMP-Silence_warning-GF
...
Silence warning message in ARAP
2021-12-20 18:06:26 +01:00
Mael Rouxel-Labbé
8bb1044d2b
Silence warning message
2021-12-14 15:54:25 +01:00
Laurent Rineau
3cea6c72d8
Merge pull request #6139 from sloriot/SMP-ambiguous
...
Fix ambiguity in function signature
2021-11-23 15:39:23 +01:00
Sébastien Loriot
c47ba58ca0
fix ambiguity in function signature
2021-11-19 13:42:11 +01:00
Sébastien Loriot
ab48f63e30
update latest cmake version tested
2021-11-09 10:58:47 +01:00
Sébastien Loriot
1857a25d28
Merge remote-tracking branch 'cgal/master' into CGAL_data-moving_files
2021-10-06 13:50:31 +02:00
Sébastien Loriot
8350dea94a
char* -> std::string
2021-10-04 09:49:24 +02:00
Sébastien Loriot
47028cd184
automatically move data files in data dir + update paths
...
Done for OFF/OBJ/STL/XYZ/PWN/PLY
2021-10-04 09:42:49 +02:00
Laurent Rineau
804feece28
Merge pull request #5761 from danston/Weights-unification-danston
...
[Small Feature] Weights Unification
2021-09-29 16:59:34 +02:00
Sébastien Loriot
71932f2f1e
manual fixes
2021-09-23 18:56:29 +02:00
Sébastien Loriot
0e4ee0c312
remove unused file
2021-09-23 18:56:14 +02:00
Sébastien Loriot
f5d2fb28a2
remove artificial dependency to Polygon
2021-09-01 16:41:36 +02:00
Dmitry Anisimov
9e89439645
user-defined mv weight is replaced with the edge tangent weight
2021-08-04 13:57:30 +02:00
Dmitry Anisimov
6fe0b062b6
smp, refactoring internal weights representation
2021-06-09 13:35:34 +02:00
Dmitry Anisimov
cac04ed149
quick mael review
2021-06-08 13:36:09 +02:00
Dmitry Anisimov
a4b645a6ad
quick andreas review
2021-06-08 12:48:15 +02:00
Dmitry Anisimov
b001ab2bcd
all, Weights dependency moved to the right place
2021-06-04 16:51:08 +02:00
Dmitry Anisimov
0719b730e1
all, missing Weights dependency
2021-06-04 16:10:53 +02:00
Dmitry Anisimov
752c07e6c4
updated weights in the surface mesh parameterization package
2021-06-04 11:23:16 +02:00
Sébastien Loriot
4e519a3c7a
move documented IO functions in IO namespace
2021-05-05 13:15:37 +02:00
Sébastien Loriot
fb6f703b55
IO namespace for files in IO directories
2021-05-04 14:36:06 +02:00
Maxime Gimeno
c49152359c
update max version of cmake and announce the new minimal in CHANGE.md
2021-04-15 15:08:54 +02:00
Laurent Rineau
f176529041
Merge pull request #5357 from sloriot/CGAL-boost_function_output-master
...
Include non-deprecated header (master)
2021-01-21 16:22:39 +01:00
Laurent Rineau
52bb68c012
Merge pull request #5356 from sloriot/CGAL-boost_function_output-5.2
...
Include non-deprecated header (5.2)
2021-01-21 16:18:55 +01:00
Sébastien Loriot
bc161f2ae9
Merge 'CGAL-Eigen3_support-5.2'
2021-01-15 10:59:20 +01:00
Sébastien Loriot
f4935dc199
Merge branch 'CGAL-Eigen3_support-5.1'
2021-01-15 10:54:02 +01:00
Sébastien Loriot
eecb00534e
fix macro name to be consistent with find_package
2021-01-15 10:43:34 +01:00
Sébastien Loriot
ad911271a9
Merge commit '6594e7549bd70923990d86c31e2aa267a79bb629' into HEAD
2021-01-15 10:12:17 +01:00
Sébastien Loriot
6594e7549b
do no include a deprecated header
2021-01-15 10:07:59 +01:00
Sébastien Loriot
bdd4efe3b3
Merge commit 'efc0c525e8b' into HEAD
2021-01-15 10:06:56 +01:00
Sébastien Loriot
efc0c525e8
include non-deprecated header
2021-01-15 10:02:00 +01:00
Maxime Gimeno
5948bc846e
Try to remove Filtered_kernel from the dependencies of BGL
2021-01-11 14:11:30 +01:00
Maxime Gimeno
5d2ad68148
Add new Dependences. ATTENTION BGL is propagated through the NPs in Stream_support
2021-01-08 15:58:46 +01:00
Maxime Gimeno
3b70343590
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2020-11-16 16:19:43 +01:00
Maxime Gimeno
cc00d293df
Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno
2020-11-06 09:37:18 +01:00
Mael Rouxel-Labbé
786ed599d6
Add missing fig entry in SMP's Doxyfile.in (HTML_EXTRA_FILES)
2020-11-03 10:52:47 +01:00
Maxime Gimeno
1c00bf6847
Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno
2020-10-29 15:09:16 +01:00
Mael Rouxel-Labbé
7c2ffc57ec
Try to fix some maybe-uninitialized warnign
2020-10-20 14:52:40 +02:00
Mael Rouxel-Labbé
1b80ca4a17
Add some more preconditions
2020-10-20 14:51:00 +02:00
Mael Rouxel-Labbé
29b9946507
Fix warnings and compilation errors
2020-10-16 09:57:04 +02:00
Mael Rouxel-Labbé
4b28101397
Misc IO fixes
2020-10-14 21:46:18 +02:00
Mael Rouxel-Labbé
7c5080c682
Add a note in SMP User Manual about why one should use IAP
2020-10-12 11:47:31 +02:00
Mael Rouxel-Labbé
479ba42269
Add missing include
2020-08-07 15:43:55 +02:00
Mael Rouxel-Labbé
30ccc1f243
Fix .h permissions
2020-08-05 11:05:22 +02:00
Maxime Gimeno
9c15f2c9dc
Use FeatureSummary in the demo, and remove CGAL_FOUND
2020-08-04 12:46:17 +02:00
Mael Rouxel-Labbé
1bdcd6f5ca
Fix license header
2020-07-28 16:25:09 +02:00
Mael Rouxel-Labbé
0700847882
Remove warning about the new API introduced in CGAL 4.11
2020-07-22 14:42:01 +02:00
Mael Rouxel-Labbé
37897e8d03
Added history and modified authors (iterative authalic parameterization)
2020-07-22 13:49:11 +02:00
Mael Rouxel-Labbé
d2289098af
Fix some conversion warnings
2020-07-22 12:33:33 +02:00
Mael Rouxel-Labbé
eb56ec4f48
Add documentation for iterative authalic parameterizer
2020-07-22 12:23:14 +02:00
Mael Rouxel-Labbé
7c4e5e74b9
Test Iterative Authalic parameterization
2020-07-21 17:47:59 +02:00
Mael Rouxel-Labbé
7ad62d7cfe
Fix compilation
2020-07-21 17:15:36 +02:00
Mael Rouxel-Labbé
91cce231f4
Fix missing typedef
2020-07-21 17:13:11 +02:00
Mael Rouxel-Labbé
50c870eb3c
Add a warning about potential degenerate faces on the square border
2020-07-21 17:12:19 +02:00
Mael Rouxel-Labbé
025df4aa9a
Add an extra overload to Iterative_authalic, for convenience
2020-07-21 17:11:53 +02:00
Mael Rouxel-Labbé
93a70d32b9
Fix documentation of Surface_mesh_parameterization
...
Too many classes/functions/typedefs/etc. showing, extract_all to blame?
2020-07-21 16:46:50 +02:00
Mael Rouxel-Labbé
aa2bdbdb5e
Add new iterative authalic example
2020-07-21 16:41:30 +02:00
Mael Rouxel-Labbé
d5185e68f8
SMP doc improvements
2020-07-21 13:38:47 +02:00
Mael Rouxel-Labbé
5bad9ff61c
Minor code cleaning
2020-07-10 12:57:45 +02:00
Mael Rouxel-Labbé
6a55952a87
Fix initialization of Boolean dedicing whether to use uniform weights or not
2020-07-10 12:56:00 +02:00
Mael Rouxel-Labbé
144a1c2b7b
Template some functions with the VIM for convenience
2020-07-10 12:55:41 +02:00
Mael Rouxel-Labbé
52323c4a94
Remove extra (and wrong) sqrt
2020-07-10 12:55:22 +02:00
Mael Rouxel-Labbé
a89cf1dd49
Store the total 3D area instead of recomputing it every err evaluation
2020-07-10 12:54:43 +02:00
Mael Rouxel-Labbé
d2cd147bad
Fix doc of Iterative_authalic_parameterization
2020-07-10 10:54:07 +02:00
Mael Rouxel-Labbé
495f6dbe1e
Add some helper functions to measure distortion between SMP input and output
2020-07-09 17:41:25 +02:00
Mael Rouxel-Labbé
07b9e89be5
Refactor Iterative Authalic parameterization
2020-07-09 17:37:46 +02:00
Mael Rouxel-Labbé
d9debb99fb
Add some explicit preconditions on the input in SMP
2020-07-09 12:02:42 +02:00
Mael Rouxel-Labbé
c9279b6e4b
Rework vertex-index/bool maps in SMP to use dynamic properties rather than sets
2020-07-07 16:04:47 +02:00
Mael Rouxel-Labbé
9c7a75f36f
Test the global API of Surface_Mesh_Parameterization
2020-07-07 15:20:28 +02:00
Mael Rouxel-Labbé
f168d3911e
Remove useless Seam_mesh overload
2020-07-07 15:19:33 +02:00
Mael Rouxel-Labbé
d45c769081
Orbifold Tutte Parameterizer is not a model of Parameterizer_3
...
The API of parameterize() is not compatible: cones must be provided by the user
2020-07-07 15:18:40 +02:00
Mael Rouxel-Labbé
6083c81d28
Modernize code and other aesthetic changes
2020-07-06 15:57:43 +02:00
Mael Rouxel-Labbé
e8a23a96ea
Update to new CMake API
2020-07-06 15:22:58 +02:00
Mael Rouxel-Labbé
c00d2c65aa
Merge remote-tracking branch 'cgal/master' into Iterative_authalic_parameterization
2020-07-06 10:10:16 +02:00
Mael Rouxel-Labbé
26355e2e32
Uniformize capital / third person usage of \brief
2020-06-25 15:13:47 +02:00
Mael Rouxel-Labbé
9cca59ba36
Actually use the new IO functions + some example improvements
2020-06-23 18:24:39 +02:00
Simon Giraudot
421096fd7f
Use imported targets everywhere
2020-04-15 14:06:13 +02:00
Hardik Jain
9e49252247
Removed: Unnecessary debug logging
2020-03-28 16:56:03 +01:00
Hardik Jain
337365a4f1
Merge branch 'master' into Iterative_authalic_parameterization
2020-03-28 16:46:51 +01:00
Hardik Jain
07dc0b2d2d
Modified: Initial inner vertices parameterization by cotangent weights
2020-03-28 16:35:24 +01:00
Hardik Jain
ee9fcee717
Modified: Tutte weights initialization for inner border vertices with valency-2. However such vertices can affect optimization.
2020-03-28 16:29:41 +01:00
Hardik Jain
c3da7a2201
Removed: Unnecessary authalic parameterizer example
2020-03-28 15:50:52 +01: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
Mael
8ee3ec8f7b
Merge branch 'master' into PMP-Add_split_to_clip-GF
2020-03-17 19:47:28 +01:00
Sebastien Loriot
1454b9903c
Merge pull request #4209 from maxGimeno/PMP-Default_pmap-maxGimeno
...
PMP: Default Property_maps for Index_maps
2020-03-17 18:27:55 +01:00
Mael Rouxel-Labbé
fba9a19fe4
Add missing #include's
2020-03-09 10:03:31 +01:00
Maxime Gimeno
138ab5e036
restore new dependency
2020-02-13 13:43:58 +01:00
Maxime Gimeno
e9864cf874
Fixes after review
2020-02-11 14:13:56 +01:00
Maxime Gimeno
0378d7825f
Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF
2020-02-10 15:53:05 +01:00
Simon Giraudot
6c8fd43ebb
Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization
2020-02-10 11:57:56 +01:00
Mael Rouxel-Labbé
84215c95c4
Merge branch 'Box_intersection_d-accelerate-GF-old' into Box_intersection_d-accelerate-GF
2020-02-07 11:03:07 +01:00
Maxime Gimeno
1f0d062c10
Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF
2020-01-27 12:51:26 +01:00
Laurent Rineau
e872a79da3
Merge pull request #4443 from MaelRL/SMP-Fix_solver_traits_pragma_message-GF
...
SMP: Fix bad usage of pragma message
2020-01-15 17:31:47 +01:00
Laurent Rineau
4a9eea9778
Merge pull request #4443 from MaelRL/SMP-Fix_solver_traits_pragma_message-GF
...
SMP: Fix bad usage of pragma message
2020-01-15 17:19:19 +01:00
Mael Rouxel-Labbé
5806b8831e
Fix bad usage of pragma message
...
The previous error message would show up even if Eigen is not available
and the user has passed a solver traits.
Reported in https://github.com/CGAL/cgal/issues/4442#issuecomment-570511774
2020-01-03 11:07:43 +01:00
Mael
cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF
2019-12-02 16:32:29 +01:00
Mael Rouxel-Labbé
41bb11cdee
Make unique indentation style a little less unique (no real changes)
2019-11-19 17:08:25 +01:00
Mael Rouxel-Labbé
b6dd62be52
Use ID_FROM_BOX_ADDRESS in Box_with_info_d where safe
...
That is, where we are passing box ranges by pointer.
See also 52ce0b6ac4
2019-11-19 17:06:47 +01:00
Laurent Rineau
15d9e1f0ff
Restore the alphabetical order of `dependencies` files
2019-10-31 14:41:37 +01: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
38539d9a70
Merge pull request #4276 from MaelRL/SMP-ARAP_improvements-GF
...
SMP: Various improvements to the ARAP parameterizer
# Conflicts:
# Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h
2019-10-15 16:33:47 +02:00
Hardik Jain
b344a2167f
Added: Parameterization comparison example in Surface_mesh_parameterization
2019-10-09 11:12:34 +02:00
Mael Rouxel-Labbé
79362c0714
Fix typo
2019-10-07 13:10:34 +02:00
Mael Rouxel-Labbé
ffb18e9e6d
Improve energy-related end condition and verbose
...
- Ignore negative energies (bad for my chakras)
- Only compute energies if we need them
- Fix verbose and counter
2019-10-07 13:08:01 +02:00
Mael Rouxel-Labbé
0840a6e1a3
Enforce constraints by not updating their position
2019-10-07 13:07:30 +02:00
Mael Rouxel-Labbé
5983a80f6f
Fix missing namespace
2019-10-07 13:07:13 +02:00
Mael Rouxel-Labbé
2b8c61b5ab
Update which solvers are used in ARAP parameterization
2019-10-07 13:04:45 +02:00
Hardik Jain
63189fae53
Added: Iterative Authalic Parameterization scheme with examples
2019-09-26 20:03:43 +02:00
Mael Rouxel-Labbé
e4c0bcffa0
Update usage of intersection tags
2019-09-19 18:32:34 +02:00
Maxime Gimeno
76e6fbcb95
Update dependencies
2019-07-05 14:54:19 +02:00
Mael Rouxel-Labbé
f68141a6d3
Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF
2019-07-01 11:28:25 +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
Mael Rouxel-Labbé
7f6cb0411c
Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF
2019-06-18 08:20:16 +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é
0b506f5cce
Fix package dependencies
2019-05-10 12:41:25 +02:00
Sébastien Loriot
a5ff70122c
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'
2019-04-12 15:43:10 +02:00
Sébastien Loriot
82103c8ebd
Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into HEAD
2019-04-12 15:42:03 +02:00
Mael Rouxel-Labbé
6b43eaa311
Mute SMP's ARAP and Orbifold by default
2019-04-05 10:27:20 +02:00
Sébastien Loriot
d60f5645aa
replace BOOST_FOREACH by c++ ranged-based for loop
...
some of the command used for the replacement:
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Laurent Rineau
0d5009e582
Merge branch 'releases/CGAL-4.13-branch'
2019-03-26 16:43:41 +01:00
Laurent Rineau
0aa49e3549
Merge pull request #3783 from afabri/BGL_add_seams-GF
...
BGL: Seam_mesh::add_seams() requires .selection.txt
2019-03-26 16:42:59 +01:00
Andreas Fabri
99a16d2c8f
Fix example
2019-03-20 16:11:48 +01:00