songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
81,923 Commits 3 Branches 156 Tags 962 MiB
Commit Graph

232 Commits

Author SHA1 Message Date
Philipp Möller a6b596396c Drop Result and Intersection_traits from Circular_kernel_2 2012-12-10 18:27:49 +01:00
Philipp Möller 03151d7bb7 intersection_return now also uses result_of 2012-12-10 17:20:36 +01:00
Philipp Möller 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
Laurent Rineau db194534c7 First big patch to fix -Wunused-local-typedefs 
-Wunused-local-typedefs is a new warning flag of gcc-4.7, and it will enabled
 by -Wall since gcc-4.8 (not yet released).

The fix is a big set of removals of unused typedefs (or comments, or moves,
depending on the context).
 2012-08-01 13:29:16 +00:00
Philipp Möller 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
Philipp Möller 542f5d9c51 Merged ^/branches/next here 2012-04-16 08:53:21 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Philipp Möller 58a6c86cbc * fixed include issue 
* some work to make Lazy work with C++11
 2011-12-15 15:45:39 +00:00
Philipp Möller 9dac440ba9 Circular kernel fixed 2011-11-24 17:49:15 +00:00
Philipp Möller 0e0a200646 * Using result_of instead of Qualified_result_of 
* limited refactoring in the lazy kernel
* still bugs in circular_3
* still specialization problem with iso_rectangle
 2011-11-23 17:52:38 +00:00
Philipp Möller 91d59f8478 Macro to define global functions now respect Intersect_2::Result<> 2011-11-16 17:48:13 +00:00
Philipp Möller 94affd589d Moved the Intersection_result concept into the functors and adapted code in the lazy kernel to that change. 2011-11-15 15:40:22 +00:00
Philipp Möller 9051768cea Introduced Intersection_results as a Kernel concept for use in public APIs in favor over Intersection_traits. 2011-11-15 13:41:14 +00:00
Philipp Möller 450f438518 IT shortcut not circumvents specifying a kernel making it an actual shortcut and nicer for exposure in APIs 2011-11-10 11:06:26 +00:00
Philipp Möller a4e6d57cff Circular_kernel_2 and Circular_kernel_3 now use CGAL_INTERSECTION_VERSION for backwards compatability 2011-11-09 14:29:46 +00:00
Philipp Möller b07e2df018 * Circular_kernel is now Object free, doesn't compile with Lazy yet, 
* hack for ternary function
 2011-08-25 21:40:12 +00:00
Philipp Möller fad504838f * Circular_kernel: - Intersections now use variants 
- removed most internal uses of Object
* Intersections: more traits, typofix, doc typofix, aliases IT23d
 2011-07-20 22:54:03 +00:00
Laurent Rineau 369498d1e5 Cancel revision 64607. There had been a problem with the branch. 
| ------------------------------------------------------------------------
  | r64607 | efif | 2011-07-05 17:27:04 +0200 (Tue, 05 Jul 2011) | 1 line
  | 
  | Merged feature-branch Aos_2-new_functors-tau into next
  | ------------------------------------------------------------------------
 2011-07-06 11:11:58 +00:00
Laurent Rineau 2bbdde3dc1 backport trunk changes 2011-06-23 12:55:08 +00:00
Monique Teillaud d784ea5019 removed old stuff that was in dont_submit anyway 2011-06-21 06:58:57 +00:00
Sébastien Loriot d5c2355419 merge the modification from experimental packages to 
the candidate branch of the feature + few name bug fixes
 2011-04-12 11:34:37 +00:00
Sébastien Loriot 8ce2048aea add #include<CGAL/config.h> before any directive CGAL_USE_* 2011-03-02 18:52:57 +00:00
Sébastien Loriot 9cbf4274ae due to correction of the traits Filtered_bbox_circular_kernel_2 
in revision 58154, Filtered_bbox_circular_kernel_2<Lazy_circular_kernel_2<K> >
was no longer working.

In Circular_kernel_2: 
  *The Rep type of Circular_arc_2, Line_arc_2 and Circular_arc_point_2 in
   Filtered_bbox_circular_kernel_2 now inherits from the Rep of the kernel
   template parameter. To allow Lazy filtering mechanism on 
   Filtered_bbox_circular_kernel_2::{Circular_arc_2,Line_arc_2,Circular_arc_point_2}
   it was needed to explicit some conversions (with Lazy_circular_kernel, we add another
   implicit construction, thus the compiler cannot find the correct constructor).
In Filtered_kernel:
  *explicit some conversions
 2010-11-10 15:52:53 +00:00
Laurent Rineau 4bc6a941fb Remove a std::cerr from my last commit. Sorry for the pollution. 2010-08-20 14:17:33 +00:00
Laurent Rineau 418d2a5f01 Refactoring of CK_2 Filtered_bbox_circular_kernel_2: 
- The three classes Circular_arc_2, Circular_arc_point_2 and Line_arc_2
    now have a proper base class with bboxes,

  - The functors of Fb_ck_2 now directly use the functors of Ck_2 (without
    bbox filtering) templated by Fb_ck_2: that avoids all creations of
    temporary objects to convert between types CGAL::Foobar_2<CK_2> and
    CGAL::Foobar_2<Fb_ck_2>.

  - The number of functors in bbox_filtered_predicates has been reduced
    quite a lot: all functors that were not using bboxes have been
    removed. They were just forwarding all there calls to the functors
    without filtering. That was useless (and created a lot of temporary
    objects).

As a side effect, Fb_ck_2 now works even with -DCGAL_CFG_MATCHING_BUG_6
(VC++), because of the removal of the temporary objects.
 2010-08-19 10:20:47 +00:00
Andreas Fabri 16010cf531 For VC++ we have to directly derive from Has_qrt 2010-08-10 08:02:28 +00:00
Sébastien Loriot 93a7d05699 Make the benchmark compiling again. 
I try to run some of the mode 'alpha' as described in the
README_benchmark_CK2.txt but this ended up with different
preconditions non validated (for alpha=1,4,5 or 8 with beta=9)
 2010-06-22 09:37:10 +00:00
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE 
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
 2010-06-09 07:37:13 +00:00
Andreas Fabri cc7b417bd4 fix bugs in VC++ workarounds 2010-05-06 09:27:16 +00:00
Sébastien Loriot f295f910f0 change LK:: to CK:: (bug on windows) 2010-05-06 09:19:35 +00:00
Andreas Fabri 83cb1edf06 Reindent and removal of duplicate typedef for Circle_2 2010-05-06 08:20:53 +00:00
Pedro Machado Manhaes de Castro 9ee39b4642 qualified result type issues 2010-04-30 16:41:23 +00:00
Sylvain Pion 85dc12f2a7 Remove empty lines at beginning and end of files 
(apply Scripts/developer_scripts/remove_empty_lines.pl).
 2010-02-01 12:55:28 +00:00
Laurent Rineau 83912b2952 Massive fix of svn:keywords properties, and $URL$ keyword. 2009-10-20 08:59:26 +00:00
Sylvain Pion 8573fe26ce Rename CGALi to internal. 2009-08-24 17:10:04 +00:00
Sylvain Pion 927b432b39 typo : mecanism -> mechanism. 2009-08-10 15:57:03 +00:00
Laurent Rineau fd76a2222d - Remove "using CK::Linear_kernel::Do_intersect_2::operator()" in 
CircularFunctor::Do_intersect_2 because
CK::Linear_kernel::Do_intersect_2::operator() and
CircularFunctor::Do_intersect_2 have exactly the same signature! The Intel
compiler is right to say there is an ambiguity in the matching.
 2009-07-10 08:21:44 +00:00
Efi Fogel 4b22c83e54 cleanup 2009-07-07 08:23:06 +00:00
Sylvain Pion f0ed774e37 Move CGAL::array to namespace CGAL::cpp0x, like tuple. 2009-04-30 14:03:52 +00:00
Pedro Machado Manhaes de Castro 66f53a570b testing calls for VC8 + bug fix 2008-10-31 17:08:32 +00:00
Pedro Machado Manhaes de Castro e7ee6ea845 fix the VC8 compatibility 2008-10-24 23:36:02 +00:00
Andreas Fabri c58989d70e make the linear kernel testsuite work with the circular kernel on VC8 2008-10-24 12:53:39 +00:00
Andreas Fabri dd0b52dfe5 make the linear kernel testsuite work with the circular kernel on VC8 2008-10-24 09:52:30 +00:00
Pedro Machado Manhaes de Castro 36b4d94397 Cmake ok name for project 2008-10-22 23:45:26 +00:00
Pedro Machado Manhaes de Castro 0d8b9ac616 Linear_kernel with CK_2 test + ambiguity fix 2008-10-22 13:32:25 +00:00
Pedro Machado Manhaes de Castro 2512af15a0 testing CK with the test of Kernel as well, (and small bug fix) 2008-10-22 11:04:08 +00:00
Andreas Fabri cb53f0f8ae Renamed template parameter as it leads to typmixup for VC8 2008-10-21 11:54:39 +00:00
Laurent Rineau 1d7a5b1625 Fix indentation. 2008-10-21 08:06:37 +00:00
Laurent Rineau ce24967b2c Modify the indentation, to help understanding the code (CRTP means a lot of 
templates arguments).
 2008-10-21 08:04:39 +00:00
Laurent Rineau 59e9173cb9 Modify the indentation, in order to understand well the templates arguments. 2008-10-21 07:32:36 +00:00
Pedro Machado Manhaes de Castro 5476d1bd01 testing Line_2, Circle_2 as well 2008-10-16 14:41:36 +00:00
Pedro Machado Manhaes de Castro f86250b818 inheritance 2008-10-15 16:21:52 +00:00
Pedro Machado Manhaes de Castro 18638671c1 removing some useless defines and trying something for GCC < 4.3 2008-10-15 16:17:20 +00:00
Pedro Machado Manhaes de Castro 005cc1ccb7 Fixing for Line_2, Circle_2 on BK stuff 2008-10-13 20:34:01 +00:00
Pedro Machado Manhaes de Castro 3e0b9e1ed4 Trying to be more precise on the namespaces so VC8 will be happy (trying at least) 2008-10-13 18:12:12 +00:00
Pedro Machado Manhaes de Castro e80226ce3c Improving the testsuite and fixing some problems 2008-10-13 17:58:36 +00:00
Pedro Machado Manhaes de Castro 8bf93852dd tunning the tests for global functions CK2 2008-10-03 14:45:43 +00:00
Pedro Machado Manhaes de Castro e33078a4e9 Circular_arc_point_2 has a constructor for Point_2 2008-10-03 11:26:19 +00:00
Pedro Machado Manhaes de Castro f39a5d6cd4 pre-condition for split_2 2008-10-02 15:45:54 +00:00
Pedro Machado Manhaes de Castro 71b58f8eb3 <, <=, >=, > operations for Circular_arc_point_2 2008-10-02 15:42:13 +00:00
Pedro Machado Manhaes de Castro 1e88811a5e point_in_x_range does not look as cool as has_in_x_range (in conformity with CGAL) 2008-10-02 14:30:30 +00:00
Pedro Machado Manhaes de Castro a379bd57d4 global functions in a single file 2008-10-01 15:24:23 +00:00
Pedro Machado Manhaes de Castro 25983e68bb only one global function file 2008-10-01 15:12:54 +00:00
Pedro Machado Manhaes de Castro e7e4e33287 Only one global function file -> global_functions_circular_kernel_2.h 2008-10-01 15:12:01 +00:00
Pedro Machado Manhaes de Castro f125fd60b0 Remove from visible stuffs the compare_y_to_left_2 2008-10-01 12:27:57 +00:00
Pedro Machado Manhaes de Castro 2775e451e5 Some Not Documented line comments 2008-10-01 12:25:23 +00:00
Pedro Machado Manhaes de Castro 939667002a remove compare_y_to_left 2008-10-01 10:41:33 +00:00
Pedro Machado Manhaes de Castro e752ba2382 global function for the functor compare_y_to_left 2008-10-01 09:18:26 +00:00
Pedro Machado Manhaes de Castro b610bdb783 testsuite for make_xy_monotone + remove some warnings 2008-10-01 09:12:03 +00:00
Pedro Machado Manhaes de Castro 15f7610a40 cleaning 2008-09-30 15:52:44 +00:00
Pedro Machado Manhaes de Castro 4124531409 test for {x,y}_extremal_point global function 2008-09-30 15:48:34 +00:00
Pedro Machado Manhaes de Castro cfaa7f3b7c Comment line on some non-documented stuff, it exists (i.e. for tests) but it is not documented 2008-09-30 14:38:33 +00:00
Pedro Machado Manhaes de Castro ca8f6c806a removing Advanced_make_{x,xy}_monotone_2, On_upper_part_2, Construct_circular_arc_2 operator()(const Circular_arc_2 &A, bool b, const Circle_2& ccut, bool b_cut), Equal_2 for types that do not match 2008-09-30 13:59:18 +00:00
Pedro Machado Manhaes de Castro 32f1dbffaf Compute_Circular_{x,y}_2 to Compute_circular_{x,y}_2 2008-09-30 13:44:20 +00:00
Pedro Machado Manhaes de Castro 2dbdeb2c71 not necessary anymore 2008-09-30 13:37:10 +00:00
Pedro Machado Manhaes de Castro d7e7e23c1a sending to trash some unfortunate global functions 2008-09-30 13:36:33 +00:00
Pedro Machado Manhaes de Castro 1bfd02a7f2 Global function for make_xy_monotone 2008-09-30 13:11:33 +00:00
Pedro Machado Manhaes de Castro cffa240949 global function compare_y_to_right with correct params (Arc, Arc, Circular_arc_point) 2008-09-30 13:07:52 +00:00
Pedro Machado Manhaes de Castro caedb2cf8f good naming of global functions 2008-09-29 18:58:39 +00:00
Pedro Machado Manhaes de Castro 56901ba7f7 Globals with T<K> instead of typename K::T, and reordering of .h so it works 2008-09-29 18:50:45 +00:00
Pedro Machado Manhaes de Castro d8f8af7e14 putting both Get_equation together in function_objects_polynomial 2008-09-18 18:53:33 +00:00
Pedro Machado Manhaes de Castro a8e2a6bbb7 moving supporting_line and circle to the deprecated area 2008-09-15 16:40:38 +00:00
Pedro Machado Manhaes de Castro dfd621367b Construct_supporting_circle_2 => Construct_circle_2 2008-09-15 15:29:11 +00:00
Pedro Machado Manhaes de Castro 61b7ab6dd2 Inheritance for result_type 2008-09-15 13:12:44 +00:00
Pedro Machado Manhaes de Castro 0ddfd915b9 Looks like this is not an usual global function in CGAL, so I remove it. 2008-09-15 13:01:55 +00:00
Pedro Machado Manhaes de Castro 5c1829d9e0 Construct_supporting_line_2 => Construct_line_2 2008-09-15 12:57:09 +00:00
Pedro Machado Manhaes de Castro b65bd7be6b Forgot adding this file (Type Equality Wrapper thread) 2008-09-12 21:30:34 +00:00
Pedro Machado Manhaes de Castro 4dffce29c5 Better Circular_arc_2/Circular_arc_point_2/Line_arc_2 Copy Constructor 2008-09-12 17:36:32 +00:00
Pedro Machado Manhaes de Castro 3ac5443b35 Small example: using a functor + A forgotten Copy Constructor 2008-09-12 14:43:12 +00:00
Pedro Machado Manhaes de Castro 476c6e7bb8 Type Equality Wrapper for Filtered Bbox + kernel stuffs (base for Circular_kernel and almost everything for Filtered_bbox_kernel), operator == for Circular_arc_2, cleaning old stuffs 2008-09-12 12:53:05 +00:00
Sylvain Pion a0be560caa New profiling tool : Profile_branch_counter, that improves the display 
of failure/calls ratios.  With the corresponding macro CGAL_BRANCH_PROFILER().
 2008-09-08 09:52:37 +00:00
Monique Teillaud 7ec77d6c81 missing include 2008-08-28 12:20:12 +00:00
Monique Teillaud 6c9be1ff58 move global functions (intersection, do_intersect) to a 'documentable' place 2008-08-27 12:38:15 +00:00
Sylvain Pion 4c79d1d5cf Rename Bool_type to Boolean. 2008-08-26 13:40:26 +00:00
Sylvain Pion 44c185f1f4 Rename boost::array to CGAL::array. 2008-08-26 13:15:21 +00:00
Sylvain Pion 53f5c9679b Add a using directive "using std::array" in namespace CGAL to import either: 
- C++0x's std:array from <array>
- TR1's std::tr1::array from <tr1/array>
- boost::array from <boost/array.hpp>
Motivation : GCC's std::array is faster than boost::array.

Move CGALi:make_array to namespace CGAL.

Document CGAL::array.
 2008-08-26 13:08:16 +00:00
Sylvain Pion a8e8ecfdcf Replace Interval_nt_advanced::unsafe_comparison by Uncertain_conversion_exception. 
(it was alrady the same type, but now the filtering code can be independent on Interval_nt_advanced
(think other interval types, or other types of filters).
 2008-07-31 13:31:26 +00:00
Sylvain Pion edcedb11fd forgot to update demo code after Triple->array changes 2008-07-27 11:40:49 +00:00
Pedro Machado Manhaes de Castro b7c906cf00 global functions and do_intersect for CK_2 2008-07-25 15:02:26 +00:00
Sylvain Pion a00960f952 Rename local typedef Triple to Triplet (makes it easier for grep to distinguish). 2008-07-25 14:51:40 +00:00