621a134f3a
add an alternative way to remove edges by remove all elements at the same time
...
Here is the output of benchmark program polygon_set_2_join.cpp on my machine
current version (polygon_set_2_join):
Timer for join is 0.316
Timer for remove_redundant_edges is 0.08799999999999997
Timer for _reset_faces is 0
Time for 402 grid crossing polygons 0.404
Timer for join is 1.512
Timer for remove_redundant_edges is 0.008000000000000007
Timer for _reset_faces is 0
Time for 1000 random polygons 1.52s
Timer for join is 3.108
Timer for remove_redundant_edges is 0
Timer for _reset_faces is 0
Time for 100000 nested polygons 3.108s
Timer for join is 6.103999999999999
Timer for remove_redundant_edges is 0.01200000000000045
Timer for _reset_faces is 0.003999999999999559
Time for 40000 disjoint polygons 6.119999999999999s
current version (polygon_set_2_join 2):
Timer for join is 0.636
Timer for remove_redundant_edges is 0.1719999999999999
Timer for _reset_faces is 0
Time for 566 grid crossing polygons 0.8079999999999999
Timer for join is 3.124000000000001
Timer for remove_redundant_edges is 0.01199999999999868
Timer for _reset_faces is 0
Time for 2000 random polygons 3.135999999999999s
Timer for join is 6.892000000000001
Timer for remove_redundant_edges is 0
Timer for _reset_faces is 0
Time for 200000 nested polygons 6.892000000000001s
Timer for join is 32.16799999999999
Timer for remove_redundant_edges is 0.04800000000000182
Timer for _reset_faces is 0.008000000000002672
Time for 160000 disjoint polygons 32.224s
2015-09-18 16:21:20 +02:00
000def03c7
create the arrangement from scratch only if there are many edges to remove
...
this update the CGAL_JOIN_CREATE_AN_ARRANGEMENT version.
The benchmark program polygon_set_2_join.cpp is now better
using the CGAL_JOIN_CREATE_AN_ARRANGEMENT version.
I've put 2 as weight parameter but it should be fine tune
to better match the cost of removing an edge
2015-09-04 18:44:00 +02:00
b916dbaa36
variant for joining polygons protected by CGAL_JOIN_CREATE_AN_ARRANGEMENT
...
this code is faster when the input contains many hole to relocate
but is bit slower on disjoint polygon for example.
This is a temporary commit to start the work with Efi
Here is the output of benchmark program polygon_set_2_join.cpp on my machine
current version (polygon_set_2_join):
Time for 402 grid crossing polygons 10.184
Time for 1000 random polygons 1.1s
Time for 100000 nested polygons 2.544s
Time for 40000 disjoint polygons 5.18s
CGAL_JOIN_CREATE_AN_ARRANGEMENT version (polygon_set_2_join):
Time for 402 grid crossing polygons 1.216
Time for 1000 random polygons 1.108s
Time for 100000 nested polygons 2.572s
Time for 40000 disjoint polygons 5.891999999999999s
current version(polygon_set_2_join 2):
Time for 566 grid crossing polygons 44.416
Time for 2000 random polygons 2.263999999999996s
Time for 200000 nested polygons 5.82s
Time for 160000 disjoint polygons 28.86000000000001s
CGAL_JOIN_CREATE_AN_ARRANGEMENT version (polygon_set_2_join 2):
Time for 566 grid crossing polygons 2.28
Time for 2000 random polygons 2.248000000000001s
Time for 200000 nested polygons 5.68s
Time for 160000 disjoint polygons 32.036s
2015-09-04 15:08:20 +02:00
78c10a3a95
add a benchmark for Polygon_set_2::join using 4 different kind of input
2015-09-04 14:00:36 +02:00
91bca286d3
Fix warnings with CGAL_USE
...
All those variables were unused only if CGAL_NDEBUG was
defined. CGAL_USE can solve that.
2015-08-19 17:37:46 +02:00
f864b0a8e8
fix line width in demos using GraphicsView
2015-07-28 15:46:11 +02:00
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
3ec0c69f8f
We want 2.8.10 for all demos
...
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
e5bcdc5f3e
Update all CMakeLists.txt
...
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
a0e7a60973
Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
...
Conflicts:
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
GraphicsView/demo/Generator/CMakeLists.txt
GraphicsView/demo/GraphicsView/CMakeLists.txt
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
GraphicsView/demo/Triangulation_2/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Mesh_3/demo/Mesh_3/CMakeLists.txt
Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_plane_item.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
0f7cb5c709
Merge branch 'MS_2-of_holes-efif-old' into MS_2-of_holes-efif
...
Conflicts:
Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h
Documentation/biblio/cgal_manual.bib
Minkowski_sum_2/test/Minkowski_sum_2/test_Minkowski_sum.cpp
2015-05-03 11:41:36 +03:00
60b47f0978
Succesfully upgraded to Qt5
2015-04-01 12:18:59 +02:00
52dc3b265d
Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5
...
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.
Conflicts:
GraphicsView/demo/Polygon/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
Installation/cmake/modules/CGALConfig_binary.cmake.in
Installation/cmake/modules/CGALConfig_install.cmake.in
Installation/cmake/modules/CGAL_Macros.cmake
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
Mesh_3/demo/Mesh_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
2015-03-30 16:02:51 +02:00
5b9be0f8c7
workaround ambiguous call in kernel intersection functions when including BSO_2
2014-12-11 16:33:29 +01:00
90c16905b1
Made all traits const. Pass traits as const reference
2014-10-25 00:37:54 +03:00
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +02:00
f1f6218ca7
Fix of some bugs with Arrangement on surface 2 and others demonstrations.
...
Improvement of some comentaries.
Change of findQt5.cmake flags using.
2014-08-14 02:15:02 +02:00
2d65524aea
All last demonstrations ported to Qt4or5. Need to check working of it on Linux.
2014-08-12 22:12:42 +02:00
baffa5a7f8
Fix a bug when LEDA is used instead of GMP
...
That is a really trivial bug fix, for a rather nasty bug! I spend
several hours on it! Currently the `leda::rational::operator>>` does not
clear the `failbit` of the stream, when it reads a number without
denominator, and the EOF directly after. The flag `eofbit` and `failbit`
are set while trying to read the '/', but in that case the `failbit`
should be cleared from the stream status.
Trivial bug fix for master.
2014-08-07 17:38:55 +02:00
2826df7237
Correction of Windows platforms bug about CGAL libraries not considered.
2014-07-22 19:07:34 +02:00
65200381d7
Arithmetic_kernel -> Exact_integer/rational
2014-07-16 18:55:30 +02:00
aee9e4eb24
Commit of new demonstrations porting.
2014-06-26 14:38:23 +02:00
0230e979e2
Merge branch 'CGAL-use_leda-GF-OLD' into CGAL-use_leda-GF
...
Conflicts:
Arrangement_on_surface_2/test/Arrangement_on_surface_2/construction_test_suite_generator.cpp
Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp
Documentation/doc/Installation.txt
Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
2014-06-18 22:50:06 +02:00
9114db9085
restore figure source files removed in 0fa2cacb
...
| commit 0fa2cacb60
2014-02-10 14:54:23 +01:00
32b8625a46
Merge branch 'Aos_2-test_spherical_blp_vd-tau'
...
* Enhancing the testsuite---adding tests for
batched, point location
vertical decomposition, and
triangulation point location.
* Various bug fixes:
bugs in point location.
memory leaks found by Andreas.
* Resolving several small issues to remove compiler warnings.
Tested last in CGAL-4.4-Ic-54.
Approved by the release manager
2013-12-11 15:15:40 +02:00
7af4a1e05a
Added destructor
2013-12-06 16:09:38 +02:00
d92ba7cb5b
removed unnecessary new (resolved leak).
2013-12-06 12:42:36 +02:00
0fa2cacb60
remove doc_tex documentation (including developer manual) and old manual tools
2013-12-03 17:27:02 +01:00
6c547e5663
Mainly added includes
2013-09-13 22:24:30 +02:00
bc03aaf30b
Put doc/ in the global dont_submit file
2013-08-20 10:57:03 +02:00
6478b8c0dc
Merge remote-tracking branch 'origin/Aos_2-remove_opt-efif'
...
Successfully tested in CGAL-4.3-Ic-120 and qualified for CGAL-4.3.
Approved by the Release Manager.
2013-08-13 15:12:34 +02:00
d282ade623
use \cgalCite instead of \cite
...
using perl -i -pe 's/\\cite\s*{?([a-zA-Z0-9:-]+)}?/\\cgalCite{$1}/g'
2013-08-05 18:25:26 +02:00
b2ef3b8673
Merge branch 'doc-remove_gif-local'
...
Successfully test in CGAL-4.3-Ic-102
This commit fixes a few issues in the doxygen documentation and in particular
the figure for the generation of latex doc.
Approved by the interim release manager
xplain why this merge is necessary,
2013-07-26 17:50:07 +02:00
2dfe8a3d73
workaround for a doxygen bug: remove space after /!* to avoid a verbatim env
...
this happens if you have an empty line or the text directly after /!*
to find them in the generated documentation, grep for "pre class=\"fragment\""
(a few of them are legitimate however)
2013-07-25 14:58:53 +02:00
143a2181b3
add latex format for \imagei doxygen command
...
perl -pe 's/^(\s*)\\image\s+html\s+(.*)\s*$/$1\\image html $2\n$1\\image latex $2\n/' -i
2013-07-25 11:50:53 +02:00
74a1ac055e
remove pdf files from doxygen doc include path
2013-07-25 11:15:18 +02:00
519b301130
remove gif files from doxygen doc include path
2013-07-25 11:14:16 +02:00
4389b0bac8
remove the usage of gif in the doxygen doc as pdflatex does handle them
...
replace the files with png
2013-07-25 11:06:13 +02:00
57101ce35d
Integrated with a recent version master
2013-07-14 14:40:09 +03:00
d4d9bc212b
replace in the doc \R by \mathbb{R}
...
\R is not a valid latex command
I used: sed -i 's/\\f$\s*\\R/\\f$ \\mathbb{R}/g'
2013-07-10 17:07:43 +02:00
716f87d2d7
rename Hidden_type to unspecified_type and update its description
2013-06-13 18:48:58 +02:00
4d9caf3763
Added names that were missing into the Doxyfile.in entries.
...
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
2013-05-30 17:55:43 +02:00
4d469821f7
Generated Doxyfile.in and dependencies
2013-05-30 14:13:47 +02:00
033fdc8c49
backquote in the ref manual
2013-04-09 14:02:15 +02:00
afea80501e
fix a typo in the ref manual
2013-04-09 14:02:14 +02:00
b6ffa7c425
Merge branch 'CGAL-fix_warnings-GF'
...
That branch was successfully tested in CGAL-4.2-Ic-205.
2013-03-27 12:23:31 +01:00
368a321901
also test leda if it is available
2013-03-22 17:00:05 +01:00
e4e209abaf
remove argc and argv
2013-03-22 12:59:50 +01:00
890b02ead6
add last missing classified reference manual
2013-03-12 18:46:37 +01:00
7d2903e230
add classified reference manual pages
2013-03-12 14:51:52 +01:00
b6dfb6c41f
virtual function of derived class must match the API of the base class
2013-02-26 07:10:26 +01:00
2d8da664a3
Merge branch 'CGAL-fix_warnings-gdamiand'
...
Conflicts:
.gitignore
Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
2013-02-22 13:02:37 +01:00
26a7e70785
New license.txt files (eol changes)
...
The new version 2.13.0 of licensecheck has changed the spaces at eol.
2013-02-19 16:46:39 +01:00
be1e1738c2
static_casts and int -> size_t in Arrangement and Boolean Set Operations
2013-02-14 13:01:58 +01:00
be12d8abcd
cleanup - mainly suggested by Shriramana Sharma
2013-02-11 16:56:09 +02:00
c9f1fa974b
cleanup - mainly by a patch provided by Shriramana Sharma
2013-02-11 16:46:33 +02:00
99968b0461
Add static_cast<int>
2013-02-08 13:01:19 +01:00
d19578725b
Fix warnings
2013-02-07 18:15:23 +01:00
c029f702a3
use more types
2013-02-07 11:02:14 +01:00
61afcbbd9b
replace define
2013-02-06 20:09:12 +01:00
0ee968a166
fix link issue to chapter and prevent linking
2013-01-31 18:58:59 +01:00
6e63d3cfa8
adding missing () in see also for functions
2013-01-09 19:48:42 +01:00
5ec28b1cf4
replacing the usage of section in user man by \cgalHeading macro call
2013-01-07 18:04:37 +01:00
32b0a10059
Merge remote-tracking branch 'origin/hot-fixes-for-Git' into Aos_2-remove_opt-efif
...
Conflicts:
.gitattributes
2012-12-30 14:19:43 +01:00
0f34f2a89e
Merge branch 'Maintenance-include-less-boost-pmoeller'
2012-12-21 09:44:18 +01:00
4c8c87f241
Merge branch 'remove_cpp0x'
2012-12-21 08:36:26 +01:00
eb11ded35e
packages for which I do maintenance stuff
2012-12-20 10:56:08 +01:00
82b2ebc865
apply the cpp0x namespace renaming in all files
2012-12-19 11:33:17 +01:00
71ea8e6e22
Minimal boost includes
...
Replace type_traits.hpp and utility.hpp with the respective
fine-grained includes.
2012-12-14 18:13:59 +01:00
75f69570dc
Change the titles of mainpages to "User Manual"
...
This leads to a slightly odd result in the search for "User Manual",
but makes the pages themselves more consistent.
2012-12-13 14:47:09 +01:00
6497d48f2f
Convert all CRLF files to LF
...
Conflicts:
Documentation/stylesheet.css
Installation/cmake/modules/CGAL_SCM.cmake
2012-12-13 12:30:37 +01:00
1adf441b18
Convert all CRLF files to LF
2012-12-03 18:44:24 +01:00
9576be3c3b
add doc in dont_submit
2012-11-27 08:42:02 +01:00
ae8362b7d6
replace \cgalModels ::FOO by \cgalModels `FOO`
...
using:
perl -pi -e 's/\\cgalModels\s+::([A-Za-z0-9_:]+)\s*$/\\cgalModels `$1`\n/'
2012-11-23 09:37:53 +01:00
c2d57c1740
fix mismatch of {}
2012-11-21 11:06:44 +01:00
e1ee35a04a
fix subsection name for concepts
2012-11-20 16:40:13 +01:00
958a79932f
fix model names
2012-11-19 18:15:48 +01:00
b429b0b227
missing html in image command
2012-11-19 18:14:51 +01:00
d0e74dd06c
document nested concepts
2012-11-19 17:51:15 +01:00
128b02abb8
update CGAL custom doxygen macros
...
corresponds to a run of the script Documentation/conversion_tools/rename_macros.sh
+manual edit of doxyassist.xml and pkglist_filter.py
2012-11-14 00:31:05 +01:00
974621b58f
start using new figure macros.
...
For Combinatorial maps, I reintroduced the original anchor names as they
were still in use in the reference manual.
2012-11-08 10:55:09 +00:00
ae159cbdf3
replace markup #, ##, ### by \section, \subsection and \subsubsection
...
(script replacement)
2012-11-06 22:02:15 +00:00
3a3d0413c8
fix typo
2012-11-02 20:42:22 +00:00
31a3c07418
Turn \refines :: into \refines `X` globally
2012-10-25 09:48:39 +00:00
1102c1994e
Internal _insert_xyz function get a more intuitive signature
...
This change is motivated by other internal function that have a
similar signature already. Example: prev1->cv<-prev2+cmp is now
he_to->cv,cv_dir->he_away
2012-10-23 12:55:25 +00:00
31e9eadf8b
Fix all PackageDescriptions to a newer layout
2012-10-19 15:52:31 +00:00
6930abecf8
cleanup
2012-10-13 20:21:53 +00:00
634f165908
functor -> function
2012-10-10 19:55:28 +00:00
b8b7a5dad3
get rid of spurious XX
2012-10-03 17:02:54 +00:00
bc48dfe5a0
Be consistent about author/authors
2012-10-03 16:40:16 +00:00
16992d9713
change link for \ccDepends
2012-10-03 11:00:43 +00:00
37778547bf
Fix example to point to paths similar to a flat layout
2012-10-01 18:02:44 +00:00
9d96057636
Add PkgDependsOn to the package summary
2012-09-27 11:13:37 +00:00
b64ba48134
The changes to move the package overview labels into the
...
PackageDescription.
2012-09-25 17:17:49 +00:00
f8f2aae5b5
reformat \code
2012-09-25 08:56:52 +00:00
e54098fb57
Throw out left over Classified files and move their content if
...
necessary.
2012-09-20 16:29:19 +00:00
bc32209fc9
Remove globally duplicated anchors.
2012-09-20 16:14:23 +00:00
Sébastien Loriot
Laurent Rineau
Andreas Fabri
Maxime Gimeno
Efi Fogel
Aurélien Vialon
Ross Hemsley
Philipp Möller
Eric Berberich
Sébastien Loriot
Philipp Möller