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
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