bff4e98d01
fix warnings mainly coming from the merge of the replace object feature branch
2013-06-24 08:44:47 +02:00
7a04853d70
fix warnings
...
detected by msvc++
2013-06-21 09:53:02 +02:00
51870e6a66
update test to use the recommended primitive
2013-06-19 19:28:54 +02:00
650f9b4295
Merge branch 'AABB_tree-one_primitive_per_object-sloriot-old' into AABB_tree-one_primitive_per_object-sloriot
...
Conflicts:
.gitattributes
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/dont_submit
AABB_tree/include/CGAL/AABB_traits.h
AABB_tree/include/CGAL/AABB_tree.h
AABB_tree/include/CGAL/internal/AABB_tree/AABB_traversal_traits.h
AABB_tree/test/AABB_tree/AABB_test_util.h
AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp
AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp
AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp
Boolean_set_operations_2/examples/Boolean_set_operations_2/bezier_traits_adapter2.cpp
Installation/cmake/modules/CGAL_Common.cmake
Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake
Installation/cmake/modules/CGAL_Macros.cmake
Installation/cmake/modules/CGAL_SetupBoost.cmake
Installation/cmake/modules/CGAL_SetupDependencies.cmake
Installation/cmake/modules/CGAL_SetupGMP.cmake
Installation/cmake/modules/CGAL_SetupGMPXX.cmake
Installation/cmake/modules/CGAL_SetupLEDA.cmake
Installation/cmake/modules/CGAL_SetupMPFI.cmake
Installation/cmake/modules/CGAL_SetupNTL.cmake
Installation/cmake/modules/CGAL_SetupRS.cmake
Installation/cmake/modules/CGAL_UseMPFI.cmake
Installation/cmake/modules/CGAL_UseNTL.cmake
Installation/cmake/modules/CGAL_UseRS.cmake
Installation/cmake/modules/CGAL_VersionUtils.cmake
Interval_skip_list/examples/Interval_skip_list/isl_terrain.pts
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_triangulation.cpp
Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm
Point_set_processing_3/include/CGAL/property_map.h
Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h
Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h
Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h
Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_segments_3.cpp
Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_spheres_3.cpp
Scripts/developer_scripts/list_package_files.rb
Scripts/developer_scripts/mirror_all_packages.rb
Scripts/developer_scripts/mirror_package.rb
Scripts/developer_scripts/mirror_package_files.rb
Scripts/developer_scripts/remove_package_files_from_build_tree.rb
Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex
Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/output.tex
2013-06-18 11:50:30 +02:00
75ebdeaeeb
update the replacement of Object_and_primitive_id ...
...
... to be a pair< variant<XXX>, Primitive_id > rather than
pair<optional<variant<XXX> >, Primitive_id >
The rational is that the optional around the variant here is not needed
since there is one around the pair.
2013-05-21 18:39:23 +02:00
d6905c61be
Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller
...
Conflicts:
AABB_tree/include/CGAL/AABB_tree.h
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h
STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-03-14 10:29:31 +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
13bac84716
less warnings in various packages
2013-02-01 10:27:07 +01:00
0ce7a00f1e
Add comments in that test program (Emacs local variables)
...
That file uses wrong lenght for TAB characters. Those comments added Emacs
buffer local variables so that Emacs users can view and edit that files
nicely.
(Approved by the release manager... who is myself.)
2013-01-24 18:12:56 +01:00
0f3476be37
Remove unused type in AABB_tree test
2013-01-23 13:45:34 +01:00
54bacd752a
Rename tests to lowercase names, for uniformity
2013-01-16 10:46:39 +01:00
827a70e110
Fix crashes when the AABB tree contains only one primitive.
...
An extra test program has been added to test all functions of the API with
a singleton AABB tree.
2013-01-16 10:39:52 +01:00
fc3061c822
Bug fix: fix AABB_tree doc and code about preconditions !empty()
...
The AABB_tree code had several assertions checkinng that the tree was not
empty. Those preconditions were not documented. There was several places in
the code were it was not really required that the tree is not empty.
This patch rationalizes the preconditions: only the function `bbox()` and
the queries about distances or closest things now require that the tree is
not empty.
2013-01-15 17:19:11 +01:00
3810676aba
Lower parameters to reduce strain on the testsuite
2012-12-07 18:00:46 +01:00
b86b662d61
Convert remaining CRLF files to LF
2012-12-04 18:47:18 +01:00
d198458ca7
Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller
...
Conflicts:
.gitattributes
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
AABB_tree/include/CGAL/AABB_traits.h
AABB_tree/include/CGAL/AABB_tree.h
AABB_tree/test/AABB_tree/AABB_test_util.h
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2/arr_queries.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/Arr_trapezoid_ric_point_location.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/intro.tex
Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
Arrangement_on_surface_2/test/Arrangement_on_surface_2/point_location.cpp
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
Filtered_kernel/include/CGAL/Lazy.h
Filtered_kernel/include/CGAL/Lazy_kernel.h
Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h
Intersections_2/test/Intersections_2/test_intersections_2.cpp
Intersections_3/test/Intersections_3/test_intersections_3.cpp
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_23/include/CGAL/Kernel/Type_mapper.h
Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
2012-12-04 17:57:53 +01:00
7d20531b1d
Convert remaining CRLF files to LF
2012-12-04 17:09:28 +01:00
3ffb31cc44
Convert all CRLF files to LF
2012-12-04 15:55:58 +01:00
1adf441b18
Convert all CRLF files to LF
2012-12-03 18:44:24 +01:00
8f22de68ce
concept bugfix
...
* CODE+DOC: Bbox_3 is a nested type in CGAL's Kernel; the code uses Bbox_3
* DOC: Add Compute_squared_distance_3 in AABBGeomTraits as it is needed by AABBTraits
* DOC: remove Splitting_direction from AABBTraits as it is not used
* DOC: Squared_distance in AABBTraits is only used between two points
(I guess the confusion from the fact that nearest_point use the other
version but without using the AABBTraits model).
* CODE+DOC add the function to construct Squared_distance functor in AABBTraits + AABB_traits
and use it instead of AABBTraits::Compute_squared_distance_3 which was not in the concept
* DOC: remove from AABB_traits types Ray_3, Line_3 and Segment_3 that are not required by AABBTraits
* CODE: The code was using AABBTraits::Point which is not in the concept. Use Point_3 instead
* CODE: reorder typedefs in AABB_traits to match concept order
2012-08-28 12:21:57 +00:00
b6acb44b19
Fix mixed eol styles introduced by the licenses change scripts
2012-08-02 12:48:04 +00:00
21283eab97
remove requirements of having get_reference_point and get_datum in the traits
2012-06-04 14:14:11 +00:00
f57fab0c0a
*variadic version of insert, cstr and rebuild of AABB_tree
...
*the traits now correctly handle the storage of primitive data
*update primitives
2012-05-15 08:46:42 +00:00
79affebe42
make the traversal and expand using the traits class
...
stored in the AABB_tree
2012-05-14 11:54:16 +00:00
31d6ebe9bf
*add primitive types for HalfedgeGraph and FaceGraph (wip)
...
*clean up triangle and segment primitive
2012-05-09 17:11:09 +00:00
17797b7271
Merge next into this branch. There have been conflicts in the
...
AABB_tree documentation, Intersections_3 and Arrangement_on_surface_2.
The merge also introduced a regression for a bug fixed in R68387 which
fixed a bug in Triangle_3 Segment_3 intersections. The relevant
testcase is in triangle_other_intersection_test.cpp.
2012-04-24 15:06:19 +00:00
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
6c8dc2c2d6
Added by error
2011-11-26 00:08:56 +00:00
f38bae38a4
Add the macro that we can define or not to bench with/without static filter
...
of Do_intersect_3
2011-11-18 15:45:32 +00:00
1ea6830233
New version of Do_intersect_3 static filter
...
This time we hope it is correct.
2011-11-18 15:34:26 +00:00
66ef67491a
benchmark now uses filtering to focus more on intersections
2011-11-18 15:26:32 +00:00
51100ae07c
Added a benchmark for any_intersection and all_intersection to compare object vs optional<variants>
2011-11-14 18:00:57 +00:00
bddbfcc8e4
Adapted AABB_tree for new intersections
2011-11-10 16:00:22 +00:00
cb2aa6f75b
DOC BUGFIX: remove last occurences of the fact that
...
the traits must be included before the kernel.
Update testsuite accordingly.
2011-06-23 07:56:17 +00:00
7543ecc606
make g++46 quiet
2011-04-12 10:23:53 +00:00
1daecf3943
move BBox vs {sphere,plane,triangle} do_intersect from AABB_tree to Intersections_3,
...
and update accordingly include directives. Update testsuite
remove unneed CMakeLists.txt from AABBtree testsuite
Remove Triangle_3_Plane_3 intersection from AABB_tree (I define it in Intersections_3 some days ago, thus a conflict)
2010-09-01 08:49:24 +00:00
44a0da017c
ADD FT to disambiguate float/double
2010-06-22 11:43:10 +00:00
ed0b940802
too many additional inculde paths
2010-06-21 15:39:16 +00:00
54f913051c
int -> size_type/std::size_t
2010-06-21 15:38:26 +00:00
90288a058b
Move do_intersect(Bbox,Bbox/Line/Ray/Seg) and intersection(Triangle,Line/Ray/Seg) to Intersections_3.
2009-12-18 15:13:30 +00:00
b33dd92a52
Update headers of test files.
2009-12-18 14:59:36 +00:00
2f80a28b5e
Don't call intersection on degenerate objects in test-suite.
2009-12-18 10:42:09 +00:00
cab2982563
Implement Sylvain's comments:
...
+ add missing includes
+ avoid object copies
+ replace CGAL_kernel_assertion(false) by CGAL_error()
+ use is() function of CGAL::Object
+ improve style (remove spaces, white lines...)
2009-12-16 17:03:17 +00:00
ab503ac11f
* Fix triangle_other test
...
* Fix Triangle_3_Ray_3_intersection.h header
2009-11-24 13:07:45 +00:00
7ff50b95a0
* Rename test files which have to be moved to kernel
...
* Fix header protection names
2009-11-20 17:02:39 +00:00
6550224744
Move and rename files (prepares integration into kernel).
2009-11-20 16:38:02 +00:00
854fef2f8a
* Update (triangle, seg/line/ray) intersection computation
...
* Enrich (triangle, seg/line/ray) test suite
* Minor formatting change in Bbox_3_line_3_do_intersect.h
2009-11-20 13:09:08 +00:00
ef8a51e15a
Fix distance bound in test.
2009-11-20 07:52:25 +00:00
5e4f15878f
Fix AABB_tree distance test.
2009-11-18 08:03:09 +00:00
640f56604e
Minor fix in test suite.
2009-11-17 16:57:29 +00:00
c095f38e66
Rewrite (seg/ray/line - bbox) predicates without divisions.
2009-11-17 16:41:57 +00:00
f7a63d0ec5
revert r52901-52902 (moving predicate from AABB_tree to Intersections_3)
2009-11-10 16:58:02 +00:00
6d4f0d0c34
Remove old tests from CMakeLists.txt.
2009-11-09 12:19:10 +00:00
b869d0956d
Move intersection predicates and constructions from AABB_tree to Intersection_3.
2009-11-09 12:10:23 +00:00
cfa88ab257
* Fix Triangle_3_line_3_intersection.h (implementation inspired from Triangle_3_line_3_do_intersect.h)
...
* Add test for triangle_3/line_3 intersection (should be enriched maybe) in file aabb_intersection.cpp
* Test exact_exact kernel in aabb_do_intersect_test.cpp
2009-10-09 14:09:14 +00:00
9ba530384f
* Fix Triangle_3_segment_3_intersection.h (implementation inspired from Triangle_3_segment_3_do_intersect.h)
...
* Add test for triangle_3 segment_3 intersection (should be enriched maybe)
* Test more kernels in aabb_do_intersect_test.cpp
2009-10-05 09:41:47 +00:00
b250422cd4
Add missing file aabb_do_intersect_test.cpp
2009-09-21 07:45:46 +00:00
5f464aec46
Merge [r51090:51960]
...
From branches/CGAL-3.5-branch/AABB_tree to trunk/AABB_tree
r51953 | stayeb | 2009-09-16 13:17:12 +0200 (Wed, 16 Sep 2009) | 1 line
* Fix AABB_tree missing default ctor.
r51936 | stayeb | 2009-09-14 19:37:18 +0200 (Mon, 14 Sep 2009) | 2 lines
* Fix ray_bbox & line_bbox do_intersect predicates for filtered kernels
* add a small test for do_intersect(seg/ray/line, bbox) queries
r51932 | lrineau | 2009-09-14 15:32:24 +0200 (Mon, 14 Sep 2009) | 3 lines
* Fix predicates of <CGAL/AABB_intersection.h>, so that they are correctly filtered when called from the global function template CGAL::do_intersect
r51931 | stayeb | 2009-09-14 15:22:12 +0200 (Mon, 14 Sep 2009) | 1 line
* Fix bbox_3_segment_3 intersection for filtered kernels.
r51868 | lrineau | 2009-09-07 17:01:48 +0200 (Mon, 07 Sep 2009) | 2 lines
* Fix the non-filtering of BBox_3-Segment_3 intersection.
2009-09-18 12:49:03 +00:00
4e5658b063
AABB tree: shorten tests duration by removing largest model.
2009-07-11 15:02:27 +00:00
0d7cc0b6b5
Fix: AABBTraits must not require size_type. The size_type is an
...
implementation detail of the class template AABB_tree, and traits classes
cannot know that type.
2009-07-08 16:16:15 +00:00
8cfd4eeeba
aabb tree:
...
- shortened unitary tests
- one warning removed
2009-07-03 07:18:35 +00:00
4c3c6e3845
AABB tree: remove warnings in ascii outputs to remove warnings in the test suite.
2009-07-01 21:18:20 +00:00
1d6e776431
AABB tree: some more cleanup.
2009-07-01 20:49:03 +00:00
18611be7bd
aabb data: normalize model.
2009-07-01 13:36:42 +00:00
8f3cbf217e
aabb tree: more code cleanup
2009-06-27 15:26:09 +00:00
dc0f8c60ce
aabb tree: cleanup test formatting
2009-06-26 15:18:35 +00:00
f3d154f62f
Remove warning. Fix wrong assert.
2009-06-26 11:43:05 +00:00
330640c7e2
aabb tree: more on tests
2009-06-25 20:45:09 +00:00
680e80157d
adds some typename
2009-06-25 15:03:45 +00:00
fd1f03e4d4
aabb tree: more on tests
2009-06-24 19:23:36 +00:00
88c549f6b1
aabb tree: more on tests
2009-06-23 20:26:45 +00:00
a52576ec1f
aabb tree: remove warning
2009-06-23 15:02:11 +00:00
7928121683
AABB tree: added canonical tetrahedron for testing
2009-06-19 10:11:01 +00:00
d454f0d1c4
* Fix aabb_distance_triangle_hint_test (check was buggy)
...
* Remove kd-tree construction in generic test function (must be done in test_impl now)
* Add aabb_naive_vs_tree_distance_segment_test
* Minor fix in naive vs tree distance tests (there is probably more to do)
2009-06-18 09:34:16 +00:00
cddf3f8606
aabb tree: fix compilation issue on VC++ (I guess on Linux this worked fine)
2009-06-17 19:41:46 +00:00
f76d00c650
Add naive vs tree distance test for triangles.
2009-06-17 16:07:52 +00:00
4ca25c817a
AABB tree: use pinion model for testing
2009-06-17 14:17:36 +00:00
4b277b85f2
AABB tree: added pinion for testing
2009-06-17 10:23:19 +00:00
c5fdd0eb17
remove boost_filesystem includes (causes compilation error on MacOSX).
2009-06-17 07:20:10 +00:00
80fee750c6
AABB tree tests
...
- get rid of boost filesystem business - as requires boost lib dependency
- fix warning
2009-06-16 22:22:02 +00:00
1f4b3347ef
Add tree vs naive implementation test. It checks that AABB_tree implementation gives the same results than naive iteration over primitives.
2009-06-15 15:45:26 +00:00
761a218fff
* Fix configuration error (boost_system is now optional)
...
* Fix singular iterator copy construction error (build with -D_GLIBCXX_DEBUG)
2009-06-09 08:10:21 +00:00
adce605e3e
Fix MacOS X link error.
2009-06-08 15:45:19 +00:00
53ab3851ae
Fix check_outputs() function.
2009-06-08 07:59:09 +00:00
1d9db3f4c0
Fix error with boost::filesystem.
2009-05-26 16:15:51 +00:00
af2ffa9abd
AABB tree: fixes on tests
2009-05-25 07:57:24 +00:00
f7250d8f19
AABB tree: speed test now parameterizable by duration.
2009-05-20 08:15:50 +00:00
18bbbad67a
AABB tree: use boost::filesystem to loop through all .off files.
2009-05-19 15:38:27 +00:00
ec8551727d
Remove one wrong call to timer.stop().
2009-05-19 14:38:41 +00:00
c9964aa7ac
AABB tree: more on tests
2009-05-18 20:33:04 +00:00
45ed27682d
AABB tree: more on tests
2009-05-18 20:22:25 +00:00
729ba7be05
Test suite code factorization. Minor fix (return type) in AABB_tree.h.
2009-05-18 14:26:29 +00:00
3395e5f699
AABB tree: removed bimba from the test
2009-05-18 09:37:06 +00:00
cc5f9e604f
sorry, unintended change
2009-05-14 08:22:32 +00:00
f47e9f1f67
one more primitive,
...
more consistent names
2009-05-14 08:20:50 +00:00
9087e9b14b
updated documentation with functors in the AABBTraits concept.
...
Should we keep the const& in the description of the functors ?
I kept them in AABBTraits, but we do not have them in AABBGeomTraits...
What should be the policy?
Note that the functors do not have the "_3" in AABBTraits,
but have it in AABBGeomTraits. This is on purpose.
2009-05-11 11:54:50 +00:00
74beff3b13
removed all warnings (-Wall -Wextra).
...
IMPORTANT THINGS
- We need to add Compute_squared_distance_3 (at least for Point_3, Point_3) to the traits requirements
- Since we use the (decorated) Traits as a template parameter for the Search_traits_3, we need to add
this as a requirement. Currently, the Search_traits_3 requests that the template parameter be a CGAL
kernel. This is much too strong!
2009-05-10 16:05:48 +00:00
0f376fb294
removed the warnings, except in one of the test cases. Working on it.
2009-05-10 15:24:04 +00:00
5b992f0ffa
AABB tree: more on distance tests with anisotropic triangle mesh model (added finger.off)
...
remove one warning
some remains in the KD-tree... was unable to remove them for now.
2009-05-09 19:57:37 +00:00
49bdb725f6
AABB tree
...
factorize some code for the tests into AABB_test_util.h
2009-05-09 07:20:07 +00:00
Sébastien Loriot
Laurent Rineau
Andreas Fabri
Guillaume Damiand
Philipp Möller
Sébastien Loriot
Laurent Rineau
Philipp Möller
Marc Glisse
Stéphane Tayeb
Pierre Alliez
Camille Wormser