64a15153a9
silent a warning that seems to be a bug of the compiler
...
http://connect.microsoft.com/VisualStudio/feedback/details/474655/warning-c4
2013-06-21 16:06:43 +02:00
c67ba90514
Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller
...
Conflicts:
Circular_kernel_2/include/CGAL/Circular_kernel_2/Circular_arc_2.h
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h
Installation/changes.html
Kernel_d/doc/Kernel_d/CGAL/intersections_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Center_of_sphere_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Compare_lexicographically_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Component_accessor_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Compute_coordinate_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Contained_in_affine_hull_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Contained_in_linear_hull_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Contained_in_simplex_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Equal_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Has_on_positive_side_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Intersect_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Less_coordinate_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Less_lexicographically_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Less_or_equal_lexicographically_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Lift_to_paraboloid_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Linear_base_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Linear_rank_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Linearly_independent_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Midpoint_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Orientation_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Oriented_side_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Orthogonal_vector_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Point_dimension_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Point_of_sphere_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Point_to_vector_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Project_along_d_axis_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Side_of_bounded_sphere_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Side_of_oriented_sphere_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Squared_distance_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Value_at_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Vector_to_point_d.h
2013-05-23 13:13:08 +02:00
7baa997ce1
Merge branch 'Filtered_kernel-ring-glisse'
...
This branch adds an additional way to filter predicates that are only doing
operations using a ring number type. In case of failure, a RT is used rather
than an FT which speeds things up.
Successfully tested in CGAL-4.3Ic-37
2013-05-23 11:15:32 +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
bf34d8553e
add missing init of the profile
2013-05-21 18:34:08 +02:00
4d1d8a83ba
Fix print_dag for Lazy_exact_nt
2013-05-03 14:17:44 +02:00
73a30bb267
Repare print_dag in Lazy
...
It has been accidentally removed by the Philipp's patch that uses Boost PP.
2013-04-18 14:45:46 +02:00
b868b2ab2b
Fix warnings
2013-04-18 14:33:12 +02:00
ba54252b16
forgot to count the number of filter failures
2013-04-12 12:06:40 +02:00
492c8442eb
Fix a typo in a comment
2013-04-09 17:37:00 +02:00
983b805260
fix compilation loop issue for decltype based result_of for Lazy
2013-03-22 11:43:18 +01:00
9fcf46e11a
replace CGAL_[kernel/qpe/triangulation/]_assertion by assert in tests
...
this should be the case, following our guidelines.
using:
find */test/* -name '*.[hc]*' | xargs sed -i 's/CGAL_assertion/assert/g'
2013-03-21 10:50:55 +01:00
f97d6b8bd9
s/boost::result_of/cpp11::result_of/g
2013-03-14 10:38:13 +01: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
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
d4b251c8fd
Use int as difference_type as it may only be in [-2, 2]
2013-02-07 16:01:48 +01:00
f0f34d45fa
workaround to force the usage of the tr1 implementation of result_of from boost
...
see http://www.boost.org/doc/libs/1_52_0/libs/utility/utility.htm#result_of
2013-02-04 11:30:28 +01:00
2ba8c67ba3
Re-implement ring filtering based on CGAL_Kernel_pred_RT.
2013-01-14 15:20:34 +01:00
c1183f781b
In the lazy kernel, forward more builtin types (like long).
2013-01-03 12:21:35 +01:00
a78d419ba8
Fix the homogeneous case.
2012-12-24 23:37:59 +01:00
215ceca0fb
Reminder that this currently breaks homogeneous kernels and needs to be
...
fixed.
2012-12-24 15:53:00 +01:00
844e285f32
For a hardcoded list of "safe" predicates, use a ring type as the exact
...
type in Filtered_kernel_base.
2012-12-24 14:16:39 +01:00
571f370e28
Rename Exact_type_selector to Exact_field_selector.
2012-12-24 12:20:13 +01:00
0b4e9c67a4
inherits from Filtered_predicates rather than defining a completely new one
...
I just needed to added a constructor where the approximate predicates and exact
one needed to be provided (which is reasonable and cannot hurts thanks to the
explicit)
2012-12-21 11:09:39 +01:00
82b2ebc865
apply the cpp0x namespace renaming in all files
2012-12-19 11:33:17 +01:00
a214d62bd6
Integrate boost::variant with Lazy kernels interaction
...
This requires changing the way Lazy_construction_XXX wrappers are
selected and some code to unpack variants.
2012-12-06 17:27:23 +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
9347a5d812
remove empty lines at end of dont_submit files
2012-11-27 08:35:33 +01:00
2db4effa7e
CMake: Fix the handling of cmake_policy
...
That is a followup-to my commit last year:
| ------------------------------------------------------------------------
| r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
|
| Try to fix my last revision about cmake_policy, with CMake-2.6.x
|
| CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
| x.y.z is greater than the current CMake version.
|
| ------------------------------------------------------------------------
The following check:
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
cmake_minimum_required(VERSION 2.6.2)
The script used to fix that was:
#!/usr/bin/env perl
$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
cmake_policy(VERSION 2.8.4)
else()
cmake_policy(VERSION 2.6)
endif()
END
while(<>) {
if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
while(<>) {
if(/^endif\(\)/) {
print "$replacement";
while(<>) {
print;
}
exit 0
}
}
}
print;
}
2012-08-22 12:35:03 +00:00
a758751485
Remove / comment out unused local typedefs. Fix one place where FT was used instead of RT (homogeneous coordinates, probably never compiled).
2012-07-28 06:21:06 +00:00
4953bbbc86
Remove buggy executable bits
2012-07-04 19:28:22 +00:00
ad2b26dbed
Fix a warning about unused variables
...
And fix a comment (t=1 instead of t=0).
2012-06-18 13:04:53 +00:00
41ba29e19a
Factorize code of Do_intersect(Bbox_3, <something>)
...
Uniform use of do_intersect_bbox_segment_aux(..) with various Boolean
template arguments.
2012-06-15 15:06:34 +00:00
1c6ba1851b
Factorize code in CGAL/internal/Static_filters/Do_intersect_3.h
...
The static filters of Do_intersect(BBox_3, Segment_3) and
Do_intersect(BBox_3, Segment_3) now use do_intersect_bbox_segment_aux(..)
from CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h
2012-06-15 14:57:36 +00:00
a72bd80380
Pass the bbox as argument instead of the six coordinates
...
That increased the perfs! :-)
2012-06-14 17:04:35 +00:00
503d441f1e
merge changes from next
2012-06-13 15:51:29 +00:00
d92a1b3fff
Remove examples/Filtered_kernel/lazykernel.cpp (was in dont_submit)
...
That example no longer compiles. It was hidden by dont_submit for a long
time, but with a full branch-build (with WITH_demos and WITH_examples
enabled), it is in the way.
2012-06-12 14:12:14 +00:00
1ea390e58b
Some macros were missing CGAL_ prefix.
...
Followup of revision 69073:
| ------------------------------------------------------------------------
| r69073 | pmoeller | 2012-05-11 11:20:13 +0200 (Fri, 11 May 2012) | 3 lines
|
| Merged ^/branches/features/Result_of-pmoeller
|
|
| ------------------------------------------------------------------------
2012-05-11 15:23:31 +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
542f5d9c51
Merged ^/branches/next here
2012-04-16 08:53:21 +00:00
00621279fb
Commit the new version of the static filter. Too slow for the moment.
2012-03-23 13:02:46 +00:00
a37c74d534
Add license files, per package
2012-01-16 15:54:22 +00:00
d26c3b4caa
Turn LGPLv2 into LGPLv3+ for new static filters created after the branch.
2012-01-13 17:00:15 +00:00
5b5dd33848
merge changes from next
2012-01-09 12:33:39 +00:00
58a6c86cbc
* fixed include issue
...
* some work to make Lazy work with C++11
2011-12-15 15:45:39 +00:00
f64a69a6cd
merged next for testsuite run
2011-12-14 16:45:31 +00:00
37a83b5416
Removed unused argument to sanitize compilation output
2011-12-14 15:18:32 +00:00
cc6c9ebb76
Fix the profiling macro calls in the static filter of Equal_3
2011-12-13 16:30:53 +00:00
1aa74178ea
Reindentation/whitespace before that can be merged in next
2011-12-12 11:59:16 +00:00
Sébastien Loriot
Laurent Rineau
Andreas Fabri
Marc Glisse
Philipp Möller
Laurent Rineau
Philipp Möller