From 0ec1b0efcccdc602ae07191fb580fec4dfed89bb Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Mon, 6 Mar 2006 23:51:27 +0000 Subject: [PATCH] - Merge H2 and H3 into Homogeneous_kernel. --- .gitattributes | 1 + Distance_2/test/Distance_2/makefile | 3 +- H2/description.txt | 2 - H3/changes.txt | 468 ----------------- H3/description.txt | 1 - H3/maintainer | 1 - {H2 => Homogeneous_kernel}/changes.txt | 475 ++++++++++++++++++ Homogeneous_kernel/description.txt | 1 + .../include/CGAL/Homogeneous.h | 0 .../CGAL/Homogeneous/Aff_transformationH2.h | 0 .../CGAL/Homogeneous/Aff_transformationH3.h | 0 .../include/CGAL/Homogeneous/CircleH2.h | 0 .../CGAL/Homogeneous/Data_accessorH2.h | 0 .../include/CGAL/Homogeneous/DirectionH2.h | 0 .../include/CGAL/Homogeneous/DirectionH3.h | 0 .../CGAL/Homogeneous/Homogeneous_base.h | 0 .../include/CGAL/Homogeneous/Iso_cuboidH3.h | 0 .../CGAL/Homogeneous/Iso_rectangleH2.h | 0 .../include/CGAL/Homogeneous/LineH2.h | 0 .../include/CGAL/Homogeneous/PlaneH3.h | 0 .../include/CGAL/Homogeneous/PointH2.h | 0 .../include/CGAL/Homogeneous/PointH3.h | 0 .../include/CGAL/Homogeneous/RayH2.h | 0 .../include/CGAL/Homogeneous/RayH3.h | 0 .../include/CGAL/Homogeneous/SphereH3.h | 0 .../include/CGAL/Homogeneous/VectorH2.h | 0 .../include/CGAL/Homogeneous/VectorH3.h | 0 .../CGAL/Homogeneous/basic_constructionsH2.h | 0 .../CGAL/Homogeneous/basic_constructionsH3.h | 0 .../CGAL/Homogeneous/distance_predicatesH2.h | 0 .../CGAL/Homogeneous/distance_predicatesH3.h | 0 .../CGAL/Homogeneous/function_objects.h | 0 .../Homogeneous/predicates_on_directionsH2.h | 0 .../CGAL/Homogeneous/predicates_on_pointsH2.h | 0 .../CGAL/Homogeneous/predicates_on_pointsH3.h | 0 .../CGAL/Homogeneous/predicates_on_rtH2.h | 0 .../include/CGAL/Homogeneous_converter.h | 0 .../include/CGAL/Simple_homogeneous.h | 0 {H2 => Homogeneous_kernel}/maintainer | 0 Kernel_23/test/Kernel/makefile | 3 +- .../release_building/include_in_release | 3 +- 41 files changed, 480 insertions(+), 478 deletions(-) delete mode 100644 H2/description.txt delete mode 100644 H3/changes.txt delete mode 100644 H3/description.txt delete mode 100644 H3/maintainer rename {H2 => Homogeneous_kernel}/changes.txt (58%) create mode 100644 Homogeneous_kernel/description.txt rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/Aff_transformationH2.h (100%) rename {H3 => Homogeneous_kernel}/include/CGAL/Homogeneous/Aff_transformationH3.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/CircleH2.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/Data_accessorH2.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/DirectionH2.h (100%) rename {H3 => Homogeneous_kernel}/include/CGAL/Homogeneous/DirectionH3.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/Homogeneous_base.h (100%) rename {H3 => Homogeneous_kernel}/include/CGAL/Homogeneous/Iso_cuboidH3.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/Iso_rectangleH2.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/LineH2.h (100%) rename {H3 => Homogeneous_kernel}/include/CGAL/Homogeneous/PlaneH3.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/PointH2.h (100%) rename {H3 => Homogeneous_kernel}/include/CGAL/Homogeneous/PointH3.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/RayH2.h (100%) rename {H3 => Homogeneous_kernel}/include/CGAL/Homogeneous/RayH3.h (100%) rename {H3 => Homogeneous_kernel}/include/CGAL/Homogeneous/SphereH3.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/VectorH2.h (100%) rename {H3 => Homogeneous_kernel}/include/CGAL/Homogeneous/VectorH3.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/basic_constructionsH2.h (100%) rename {H3 => Homogeneous_kernel}/include/CGAL/Homogeneous/basic_constructionsH3.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/distance_predicatesH2.h (100%) rename {H3 => Homogeneous_kernel}/include/CGAL/Homogeneous/distance_predicatesH3.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/function_objects.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/predicates_on_directionsH2.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/predicates_on_pointsH2.h (100%) rename {H3 => Homogeneous_kernel}/include/CGAL/Homogeneous/predicates_on_pointsH3.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous/predicates_on_rtH2.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Homogeneous_converter.h (100%) rename {H2 => Homogeneous_kernel}/include/CGAL/Simple_homogeneous.h (100%) rename {H2 => Homogeneous_kernel}/maintainer (100%) diff --git a/.gitattributes b/.gitattributes index ad52fd2c67f..cb4f868521b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -489,6 +489,7 @@ HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional.eps -text HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional.gif -text svneol=unset#unset HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional.pdf -text svneol=unset#unset HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional_small.gif -text svneol=unset#unset +Homogeneous_kernel/changes.txt -text Installation/config/support/README -text Installation/config/support/S05-BOOST -text Installation/config/support/S20-GMP -text diff --git a/Distance_2/test/Distance_2/makefile b/Distance_2/test/Distance_2/makefile index 7b274b759d8..3daf268b125 100644 --- a/Distance_2/test/Distance_2/makefile +++ b/Distance_2/test/Distance_2/makefile @@ -15,8 +15,7 @@ include $(CGAL_MAKEFILE) CXXFLAGS = \ -I../../include \ -I../../../Cartesian_kernel/include \ - -I../../../H2/include \ - -I../../../H3/include \ + -I../../../Homogeneous_kernel/include \ $(TESTSUITE_CXXFLAGS) \ $(EXTRA_FLAGS) \ $(CGAL_CXXFLAGS) \ diff --git a/H2/description.txt b/H2/description.txt deleted file mode 100644 index 3106bd9dca7..00000000000 --- a/H2/description.txt +++ /dev/null @@ -1,2 +0,0 @@ -2-dimenionsal kernel with homogeneous representation - diff --git a/H3/changes.txt b/H3/changes.txt deleted file mode 100644 index 8215cde37a0..00000000000 --- a/H3/changes.txt +++ /dev/null @@ -1,468 +0,0 @@ -11 May 2005 Sylvain Pion -- New predicate : orientation(3 Vector_3). - -================================ CGAL 3.1 ========================== - -14 September 2004 Sylvain Pion -- More global functions call the functors. - -20 June 2004 Sylvain Pion -- Add missing this->. -- Replace some CGAL:: by CGAL_NTS. - -19 May 2004 Andreas Fabri -- The global_operators from VectorH3.h are turned into function objects - -13 Mar 2004 Sylvain Pion -- Move centroid() to the new scheme. - -13 Mar 2004 Sylvain Pion -- Use LineC3 instead of LineH3. -- Merge Construct_line_3 between H&C. -- Duplicate Construct_projected_point_3 between H&C. - -13 Mar 2004 Sylvain Pion -- Factorize identical Coplanar_3 functors between H&C. -- Move to the new scheme : - orientation(4 Point_3), coplanar(4 Point_3), - are_positive_oriented(4 Point_3), are_negative_oriented(4 Point_3), - side_of_oriented_sphere(5 Point_3) - -13 Mar 2004 Sylvain Pion -- Use TetrahedronC3 instead of TetrahedronH3. - Duplicate Compute_volume_3 and Bounded_side_3 functors instead. - -13 Mar 2004 Sylvain Pion -- Use TriangleC3 instead of TriangleH3. - Duplicated Has_on_3 instead. - -13 Mar 2004 Sylvain Pion -- Move the following to the new scheme : - area(3 Point_2), operator-(2 Point_[23]), collinear(3 Point_3), - angle(3 Point_3), coplanar_orientation([34] Point_3), - coplanar_side_of_bounded_circle(4 Point_3), are_ordered_along_line(3 Point_3), - are_strictly_ordered_along_line(3 Point_3), - collinear_are_strictly_ordered_along_line(3 Point_3) - -29 Feb 2004 Sylvain Pion -- Replace SegmentH3 by Cartesian's SegmentC3 ! - -29 Feb 2004 Sylvain Pion -- Move cross_product() to the new scheme. - -29 Feb 2004 Sylvain Pion -- Added ComputeScalarProduct_[23] functors. -- Added [RT|FT] multiplication from left to Vector_[23]. [bug#194] -- Moved the operator* of Vector_[23] to the new scheme. - -21 Feb 2004 Sylvain Pion -- Move internal predicates(p,q,K) to CGALi. - -19 Feb 2004 Sylvain Pion -- Internal *H[23] classes do not publicly derive from the Handle stuff, - but private data member instead. - -2.75 (18 January 2004) -- Replace obsolete CGAL_NULL_TMPL_ARGS by <>. - -2.74 (18 January 2004) -- Remove obsolete CGAL_VC7_BUG_PROTECTED workaround (VC++ <= 7.0). - -2.73 (15 January 2004) -- Add volume(4 points). - -2.72 (1 January 2004) -- New faster Handle_for interface -- More work towards extensible kernel. - -2.71 (17 December 2003) -- Added Compute_area_3, and a version of Compute_squared_area_3 taking 3 - points. - -2.70 (4 December 2003) -- More bisector() functions. - -2.69 (19 November 2003) -- Added bisector(Point_3, Point_3). - -2.68 (18 November 2003) -- Remove deprecated stuff. - -=========================== CGAL 3.0 ======================= - -2.67 (21 October 2003) -- fix headers - -2.66 (18 September 2003) -- New headers - -2.65 (8 August 2003) -- Simplify default constructors to have better optimization. - -2.64 (8 August 2003) -- Add squared_length() to Vector_3. - -2.63 (6 June 2003) -- Workaround SunPro for Intersections_3's test-suite. - -2.62 (2 June 2003) -- Replace deprecated cmp_dist_to_point(). - -2.61 (2 June 2003) [af] -- bbox() now uses to_interval for PointH3 and SphereH3 - -2.60 (30 May 2003) -- Fix infinite recursion in RayH3 (is_degenerate() <-> to_vector()). - -2.59 (11 May 2003) -- Add missing functor for Plane_3(Point_3, Vector_3). -- In order to get rid of Direction_3 at some point, I have added : - - Line_3(Point_3, Vector_3) ConstructLine_3 - - Ray_3(Point_3, Vector_3) ConstructRay_3 - - Ray_3(Point_3, Line_3) ConstructRay_3 - - Vector_3(Line_3) ConstructVector_3 - - Vector_3(Ray_3) ConstructVector_3 - - Vector_3(Segment_3) ConstructVector_3 - - Vector_3 Line_3.to_vector() - - Vector_3 Ray_3.to_vector() - - Vector_3 Segment_3.to_vector() - -2.58 (11 April 2003) [af] -- bug fix in Iso_cuboid_3 - -2.57 (19 February 2003) -- removed a const to make an Sgi CC warning disappear - -2.56 (11 February 2003) -- Add squared_radius(p, q). - -2.55 (29 January 2003) -- "far" is rejected by VC++ (used to be a keyword). - -2.54 (22 January 2003) -- Add coordinate iterator -- Add new constructor Iso_cuboid_3(left, right, bottom, top, far, close). -- Fixes for newer GCC. - -2.53 (20 January 2003) -- Remove #ifdef CGAL_CFG_TYPENAME_BUG stuff, as VC6 is not supported anymore. - -2.52 (20 January 2003) -- Remove *handle_[23] types from the main kernel classes. - -2.51 (7 January 2003) -- Replace "3" by RT(3) so that Quotient works. - -2.50 (5 October 2002) -- Add explicit types to function templates to support expression templates - (GMP++). - -2.49 (6 February 2002) -- VC7 workarounds. - -2.48 (4 February 2002) -- VC++ fixes. - -2.47 (30 January 2002) -- submit again... - -2.46 (30 January 2002) -- Fixes for MipsPro and VC6. - -2.45 (28 January 2002) -- Fixes for VC++. -- Fixes for KCC (access to private types like VectorH3::Vector_3). - -2.44 (22 January 2002) -- Classes and funtion return type only refer to R::... - -2.43 (4 January 2002) -- Replace the small helper *rep classes by std::pair and triple. -- Tetrahedron_3.orientation() is not cached anymore. - -2.42 (12 December 2001) -- Add IO operators for SphereH3. - -2.41 (1 December 2001) -- operator<< of various kernel object required more than R to be public. - -2.40 (24 October 2001) -- Handles simplifications. - -2.39 (23 October 2001) -- added missing Homogeneous directory in include statement - -2.38 (23 October 2001) -- moved *H3.h include files to include/CGAL/Homogeneous directory -- replaced KERNEL_CTOR* macros with KERNEL_* macros - -2.37 (16 October 2001) -- Replace Handle/Rep by Handle_for/Ref_counted. -- Hardcoded dependencies between classes removed. -- Point, Vector, Direction classes now in their own files -- made typedefs in kernel object classes private - -2.36 (2 October 2001) -- Access functions of objects (like .x() ) now return const references. - -2.35 (15 August 2001) -- SunPro patches. - -=========================== CGAL 2.3 ======================= - -2.34 (23 July 2001) -- renamed cmp_* to compare_* and *_dist_* to *_distance_* and - leftturn, Leftturn, LEFTTURN to left_turn, Left_turn, LEFT_TURN and - rightturn, Rightturn, RIGHTTURN to right_turn, Right_turn, RIGHT_TURN - and compare_lexicographically* to compare_* - (deprecated the old names but didn't remove them). - - -2.33 (10 July 2001) -- deprecated has_on_boundary for Plane_3 -- New predicate : coplanar_orientation(3 points). - -2.32 (21 June 2001) -- New constructors for DirectionH3. - -2.31 (20 June 2001) -- Remove #include - -2.30 (19 June 2001) -- fixed bug in centroid - -2.29 (19 June 2001) -- added centroid - -2.28 (2 May 2001) -- angle() -- Fix operator<<(Iso_cuboid_3). - -2.27 (26 Apr 2001) -- Change coplanar_side_of_oriented_circle - to coplanar_side_of_bounded_circle. - -2.26 (13 Apr 2001) -- Added coplanar_side_of_oriented_circle(p,q,r,t). - -2.25 (12 Apr 2001) -- Fix off by one error in Triangle::vertex(). - -2.24 (20 Mar 2001) -- Added squared_radius(). - -2.23 (16 Mar 2001) -- Added constructor Vector(Point, Point). -- side_of_bounded_sphere(3 or 4 points). - -2.22 (6 Mar 2001) -- Remove useless friends in PVDH3.h. -- Make operator*(VectorH3, VectorH3) a member function. - -2.21 (28 Feb 2001) -- Even more VC++ fixes. - -2.20 (21 Feb 2001) -- VC++ fixes. - -2.19 (19 Feb 2001) -- Use the function object Less_xyz_3 instead of CGAL::Less_xyz<>. -- Modified return types "typename R::RT" for VC++. - -2.18 (15 Feb 2001) -- Add some "#define typename" to please VC++. - -2.17 (14 Feb 2001) -- added min_coord(), max_coord() in Iso_cuboid_3 and new constructor - -2.16 (13 Feb 2001) -- Macro cleanups. -- squared_area() and volume() functions added -- Simple_homogeneous. -- Remove old style casts. - -2.15 (22 Jan 2001) -- CGAL::compare -> CGAL_NTS compare in SphereH3 to fix a warning. - -2.14 (15 Oct 2000) - -- SphereH3.h: Default argument value redeclaration fixed - -2.13 (11 Oct 2000) - -- use of keyword 'or' removed in SphereH3 - -%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 2 . 2 %%%%%%%%%%%%%%%%%%%%%%%%%%%% - -2.12 (16 Aug 2000) - -- cross_product is not a friend anymore, neither of VectorH3 nor - of DirectionH3 (is currently not necessary, since all functions - used are public) -- call of cross_product in PlaneH3 replaced by code from cross_product. - There have been strange problems with bcc5.5. Hope they are solved - by this fix. - -2.11 (26 Jul 2000) - -- in-place-new replaced by Handle_for( RefCounted ) constructor calls - and calls of Handle_for::initialize_with( RefCounted ) -- identical(.) and id() member functions removed (base class Handle_for<> - has a member functions identical(.) and id() since version 3.9) - -2.10 (20 Jul 2000) - -- CGAL_ prefix added in - o orientation_predicatesH3.h:#define ORIENTATION_PREDICATESH3_H - o predicates_on_pointsH3.h:#define PREDICATES_ON_POINTSH3_H - -2.9 (28 Jun 2000) - -- SphereH3 added -- some constructions added - plane bisector( point, point) - point gp_linear_intersection( plane, plane, plane) - point circumcenter( point, point, point) - -2.8 (08 Jun 2000) - -- CGAL_NTS used - -2.7 (19 Apr 2000) - -- LineH3 now uses Handle_for<> -- PlaneH3 now uses Handle_for<> -- RayH3 now uses Handle_for<> -- SegmentH3 now uses Handle_for<> -- TetrahedronH3 now uses Handle_for<> -- TriangleH3 now uses Handle_for<> -- leading _ with FT,RT removed in Aff_transformationH3 - -2.6 (03 Apr 2000) - -- h?_ref() access added to PointH3 - -2.5 (30 Mar 2000) - -- Handle_for> used for PointH3, VectorH3, and DirectionH3 - -2.4 (16 Feb 2000) - -- Iso_cuboidH3 revised - Handle_for<> used in Iso_cuboidH3 - -%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 2 . 1 %%%%%%%%%%%%%%%%%%%%%%%%%%%% - -2.3.6 -> 2.3.7 (03 Dec 99) -- typename added before std::vector< PointH3 >::iterator - (detected by -pedantic with gcc-2.95) - -2.3.5 -> 2.3.6 (07 Nov 99) -- Identity + rep in Aff_transformationH3 - -2.3.4 -> 2.3.5 (08 Oct 99) -- DirectionH3::vector() replaced by DirectionH3::to_vector() - -2.3.3 -> 2.3.4 (17 Sep 99) -- distance_predicatesH3.h added - -2.3.2 -> 2.3.3 (14 Sep 99) -- -- - -2.3.1 -> 2.3.2 (01 Sep 99) -- qualified sign by CGAL:: - -2.3 -> 2.3.1 (09 Aug 99) -- coplanar_orientation(p,q,r,s) added - -2.2.1 -> 2.3 (04 Aug 99) -- updates/workarounds for gcc-2.95: - s/friend inline/friend CGAL_FRIEND_INLINE - s/friend CGAL_KERNEL_INLINE/friend CGAL_KERNEL_FRIEND_INLINE - made all operator-() friends non-friends in - -%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 2 . 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%% - -2.2 -> 2.2.1 (26 May 99) -- CGAL_KERNEL_INLINE added for declaration of cross_product on - DirectionH3 - -2.1.3 -> 2.2 (20 May 99) -- equality test for TetrahedronH3 fixed - -2.1.2 -> 2.1.3 (06 May 99) -- inline and CGAL_KERNEL_INLINE added to forward declarations in PVDH3.h - (external/internal linkage conflict warning by mips) - -2.1.1 -> 2.1.2 (28 Apr 99) -- sign() qualified by CGAL:: (PlaneH3) - -2.1 -> 2.1.1 (28 Apr 99) -- prefixed compare() by CGAL:: - -2.0.5 -> 2.1 (16 Apr 99) -- iostream parts prefixed by std:: - -2.0.4 -> 2.0.5 (30 Mar 99) -- to_double() prefixed by CGAL:: - -2.0.3 -> 2.0.4 (22 Mar 99) -- call of sign() DirectionH3::operator==( const DirectionH3& d) - 'prefixed' by CGAL:: - -2.0.2 -> 2.0.3 (20 Mar 99) -- flag CGAL_NO_NAMESPACE corrected - -2.0.1 -> 2.0.2 (14 Mar 99) -- std::swap used in code for bbox() - -2.0 -> 2.0.1 (24 Feb 99) -- CGAL_[BEGIN|END]_NAMESPACE used - -1.5 -> 2.0 -- namespace CGAL { } introduced - -%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 1 . 2 %%%%%%%%%%%%%%%%%%%%%%%%%%%% - -1.4 -> 1.5 -- Use of CGAL...INLINE made consistent between declarations and - definitions (otherwise SunPro CC 4.2 does not like it). - -1.3.1 -> 1.4 -- bug in CGAL_collinear_are_ordered_along_line(p,q,r) fixed; case p == r -- CGAL_PointH3< > operator-(const CGAL_Origin&, const CGAL_VectorH3< >&) - added -- warning in VectorH3::cartesian(int i) fixed - -%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 1 . 1 %%%%%%%%%%%%%%%%%%%%%%%%%%%% - -1.3 -> 1.3.1 -- bugs in PlaneH3::to_2d() and PlaneH3::to_3d() fixed - -1.2 -> 1.3 -- basic_constructionsH3.h extended (circumcenter) -- (strict_)order_along_line added/updated -- midpoint(p,q) added - -1.1.1 -> 1.2 -- side_of...sphere predicates added -- assert replaced by CGAL_kernel_assertion in TetrahedronH3.h - -%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 1 . 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%% - -1.1. -> 1.1.1 -- basic_constructionsH3.h added -- PlaneH3::projection(...) added - -1.0.1 -> 1.1 -- made fit for egcs - -1.0 -> 1.0.1 -- predicates_on_pointsH3.h is now also included in LineH3.h - -0.9 -> 1.0 -- New access functions have been added to Aff_transformation. -- New inline policy is now used: There are several levels of - inlining to be defined in kernel_basic.h. -- typename keyword has been added -- warnings for `unreachable statements' should disappear diff --git a/H3/description.txt b/H3/description.txt deleted file mode 100644 index d9af580065e..00000000000 --- a/H3/description.txt +++ /dev/null @@ -1 +0,0 @@ -3d homogeneous kernel diff --git a/H3/maintainer b/H3/maintainer deleted file mode 100644 index 894b5eb2cd9..00000000000 --- a/H3/maintainer +++ /dev/null @@ -1 +0,0 @@ -Sylvain Pion diff --git a/H2/changes.txt b/Homogeneous_kernel/changes.txt similarity index 58% rename from H2/changes.txt rename to Homogeneous_kernel/changes.txt index ec257ad28f6..f6e779065e7 100644 --- a/H2/changes.txt +++ b/Homogeneous_kernel/changes.txt @@ -1,3 +1,8 @@ +7 March 2006 Sylvain Pion +- Merge H2 and H3 packages in Homogeneous_kernel. + +=============== OLD H2 package changes ===================== + 15 September 2005 Sylvain Pion - Functors : Use K::Oriented_side and co instead of hardcoded CGAL:: enums. - Functors : miscelaneous cleanups. @@ -673,3 +678,473 @@ - added functionality as described in _2 description - new inline policy, cf. kernel_basic.h +=============== OLD H3 package changes ===================== + +11 May 2005 Sylvain Pion +- New predicate : orientation(3 Vector_3). + +================================ CGAL 3.1 ========================== + +14 September 2004 Sylvain Pion +- More global functions call the functors. + +20 June 2004 Sylvain Pion +- Add missing this->. +- Replace some CGAL:: by CGAL_NTS. + +19 May 2004 Andreas Fabri +- The global_operators from VectorH3.h are turned into function objects + +13 Mar 2004 Sylvain Pion +- Move centroid() to the new scheme. + +13 Mar 2004 Sylvain Pion +- Use LineC3 instead of LineH3. +- Merge Construct_line_3 between H&C. +- Duplicate Construct_projected_point_3 between H&C. + +13 Mar 2004 Sylvain Pion +- Factorize identical Coplanar_3 functors between H&C. +- Move to the new scheme : + orientation(4 Point_3), coplanar(4 Point_3), + are_positive_oriented(4 Point_3), are_negative_oriented(4 Point_3), + side_of_oriented_sphere(5 Point_3) + +13 Mar 2004 Sylvain Pion +- Use TetrahedronC3 instead of TetrahedronH3. + Duplicate Compute_volume_3 and Bounded_side_3 functors instead. + +13 Mar 2004 Sylvain Pion +- Use TriangleC3 instead of TriangleH3. + Duplicated Has_on_3 instead. + +13 Mar 2004 Sylvain Pion +- Move the following to the new scheme : + area(3 Point_2), operator-(2 Point_[23]), collinear(3 Point_3), + angle(3 Point_3), coplanar_orientation([34] Point_3), + coplanar_side_of_bounded_circle(4 Point_3), are_ordered_along_line(3 Point_3), + are_strictly_ordered_along_line(3 Point_3), + collinear_are_strictly_ordered_along_line(3 Point_3) + +29 Feb 2004 Sylvain Pion +- Replace SegmentH3 by Cartesian's SegmentC3 ! + +29 Feb 2004 Sylvain Pion +- Move cross_product() to the new scheme. + +29 Feb 2004 Sylvain Pion +- Added ComputeScalarProduct_[23] functors. +- Added [RT|FT] multiplication from left to Vector_[23]. [bug#194] +- Moved the operator* of Vector_[23] to the new scheme. + +21 Feb 2004 Sylvain Pion +- Move internal predicates(p,q,K) to CGALi. + +19 Feb 2004 Sylvain Pion +- Internal *H[23] classes do not publicly derive from the Handle stuff, + but private data member instead. + +2.75 (18 January 2004) +- Replace obsolete CGAL_NULL_TMPL_ARGS by <>. + +2.74 (18 January 2004) +- Remove obsolete CGAL_VC7_BUG_PROTECTED workaround (VC++ <= 7.0). + +2.73 (15 January 2004) +- Add volume(4 points). + +2.72 (1 January 2004) +- New faster Handle_for interface +- More work towards extensible kernel. + +2.71 (17 December 2003) +- Added Compute_area_3, and a version of Compute_squared_area_3 taking 3 + points. + +2.70 (4 December 2003) +- More bisector() functions. + +2.69 (19 November 2003) +- Added bisector(Point_3, Point_3). + +2.68 (18 November 2003) +- Remove deprecated stuff. + +=========================== CGAL 3.0 ======================= + +2.67 (21 October 2003) +- fix headers + +2.66 (18 September 2003) +- New headers + +2.65 (8 August 2003) +- Simplify default constructors to have better optimization. + +2.64 (8 August 2003) +- Add squared_length() to Vector_3. + +2.63 (6 June 2003) +- Workaround SunPro for Intersections_3's test-suite. + +2.62 (2 June 2003) +- Replace deprecated cmp_dist_to_point(). + +2.61 (2 June 2003) [af] +- bbox() now uses to_interval for PointH3 and SphereH3 + +2.60 (30 May 2003) +- Fix infinite recursion in RayH3 (is_degenerate() <-> to_vector()). + +2.59 (11 May 2003) +- Add missing functor for Plane_3(Point_3, Vector_3). +- In order to get rid of Direction_3 at some point, I have added : + - Line_3(Point_3, Vector_3) ConstructLine_3 + - Ray_3(Point_3, Vector_3) ConstructRay_3 + - Ray_3(Point_3, Line_3) ConstructRay_3 + - Vector_3(Line_3) ConstructVector_3 + - Vector_3(Ray_3) ConstructVector_3 + - Vector_3(Segment_3) ConstructVector_3 + - Vector_3 Line_3.to_vector() + - Vector_3 Ray_3.to_vector() + - Vector_3 Segment_3.to_vector() + +2.58 (11 April 2003) [af] +- bug fix in Iso_cuboid_3 + +2.57 (19 February 2003) +- removed a const to make an Sgi CC warning disappear + +2.56 (11 February 2003) +- Add squared_radius(p, q). + +2.55 (29 January 2003) +- "far" is rejected by VC++ (used to be a keyword). + +2.54 (22 January 2003) +- Add coordinate iterator +- Add new constructor Iso_cuboid_3(left, right, bottom, top, far, close). +- Fixes for newer GCC. + +2.53 (20 January 2003) +- Remove #ifdef CGAL_CFG_TYPENAME_BUG stuff, as VC6 is not supported anymore. + +2.52 (20 January 2003) +- Remove *handle_[23] types from the main kernel classes. + +2.51 (7 January 2003) +- Replace "3" by RT(3) so that Quotient works. + +2.50 (5 October 2002) +- Add explicit types to function templates to support expression templates + (GMP++). + +2.49 (6 February 2002) +- VC7 workarounds. + +2.48 (4 February 2002) +- VC++ fixes. + +2.47 (30 January 2002) +- submit again... + +2.46 (30 January 2002) +- Fixes for MipsPro and VC6. + +2.45 (28 January 2002) +- Fixes for VC++. +- Fixes for KCC (access to private types like VectorH3::Vector_3). + +2.44 (22 January 2002) +- Classes and funtion return type only refer to R::... + +2.43 (4 January 2002) +- Replace the small helper *rep classes by std::pair and triple. +- Tetrahedron_3.orientation() is not cached anymore. + +2.42 (12 December 2001) +- Add IO operators for SphereH3. + +2.41 (1 December 2001) +- operator<< of various kernel object required more than R to be public. + +2.40 (24 October 2001) +- Handles simplifications. + +2.39 (23 October 2001) +- added missing Homogeneous directory in include statement + +2.38 (23 October 2001) +- moved *H3.h include files to include/CGAL/Homogeneous directory +- replaced KERNEL_CTOR* macros with KERNEL_* macros + +2.37 (16 October 2001) +- Replace Handle/Rep by Handle_for/Ref_counted. +- Hardcoded dependencies between classes removed. +- Point, Vector, Direction classes now in their own files +- made typedefs in kernel object classes private + +2.36 (2 October 2001) +- Access functions of objects (like .x() ) now return const references. + +2.35 (15 August 2001) +- SunPro patches. + +=========================== CGAL 2.3 ======================= + +2.34 (23 July 2001) +- renamed cmp_* to compare_* and *_dist_* to *_distance_* and + leftturn, Leftturn, LEFTTURN to left_turn, Left_turn, LEFT_TURN and + rightturn, Rightturn, RIGHTTURN to right_turn, Right_turn, RIGHT_TURN + and compare_lexicographically* to compare_* + (deprecated the old names but didn't remove them). + + +2.33 (10 July 2001) +- deprecated has_on_boundary for Plane_3 +- New predicate : coplanar_orientation(3 points). + +2.32 (21 June 2001) +- New constructors for DirectionH3. + +2.31 (20 June 2001) +- Remove #include + +2.30 (19 June 2001) +- fixed bug in centroid + +2.29 (19 June 2001) +- added centroid + +2.28 (2 May 2001) +- angle() +- Fix operator<<(Iso_cuboid_3). + +2.27 (26 Apr 2001) +- Change coplanar_side_of_oriented_circle + to coplanar_side_of_bounded_circle. + +2.26 (13 Apr 2001) +- Added coplanar_side_of_oriented_circle(p,q,r,t). + +2.25 (12 Apr 2001) +- Fix off by one error in Triangle::vertex(). + +2.24 (20 Mar 2001) +- Added squared_radius(). + +2.23 (16 Mar 2001) +- Added constructor Vector(Point, Point). +- side_of_bounded_sphere(3 or 4 points). + +2.22 (6 Mar 2001) +- Remove useless friends in PVDH3.h. +- Make operator*(VectorH3, VectorH3) a member function. + +2.21 (28 Feb 2001) +- Even more VC++ fixes. + +2.20 (21 Feb 2001) +- VC++ fixes. + +2.19 (19 Feb 2001) +- Use the function object Less_xyz_3 instead of CGAL::Less_xyz<>. +- Modified return types "typename R::RT" for VC++. + +2.18 (15 Feb 2001) +- Add some "#define typename" to please VC++. + +2.17 (14 Feb 2001) +- added min_coord(), max_coord() in Iso_cuboid_3 and new constructor + +2.16 (13 Feb 2001) +- Macro cleanups. +- squared_area() and volume() functions added +- Simple_homogeneous. +- Remove old style casts. + +2.15 (22 Jan 2001) +- CGAL::compare -> CGAL_NTS compare in SphereH3 to fix a warning. + +2.14 (15 Oct 2000) + +- SphereH3.h: Default argument value redeclaration fixed + +2.13 (11 Oct 2000) + +- use of keyword 'or' removed in SphereH3 + +%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 2 . 2 %%%%%%%%%%%%%%%%%%%%%%%%%%%% + +2.12 (16 Aug 2000) + +- cross_product is not a friend anymore, neither of VectorH3 nor + of DirectionH3 (is currently not necessary, since all functions + used are public) +- call of cross_product in PlaneH3 replaced by code from cross_product. + There have been strange problems with bcc5.5. Hope they are solved + by this fix. + +2.11 (26 Jul 2000) + +- in-place-new replaced by Handle_for( RefCounted ) constructor calls + and calls of Handle_for::initialize_with( RefCounted ) +- identical(.) and id() member functions removed (base class Handle_for<> + has a member functions identical(.) and id() since version 3.9) + +2.10 (20 Jul 2000) + +- CGAL_ prefix added in + o orientation_predicatesH3.h:#define ORIENTATION_PREDICATESH3_H + o predicates_on_pointsH3.h:#define PREDICATES_ON_POINTSH3_H + +2.9 (28 Jun 2000) + +- SphereH3 added +- some constructions added + plane bisector( point, point) + point gp_linear_intersection( plane, plane, plane) + point circumcenter( point, point, point) + +2.8 (08 Jun 2000) + +- CGAL_NTS used + +2.7 (19 Apr 2000) + +- LineH3 now uses Handle_for<> +- PlaneH3 now uses Handle_for<> +- RayH3 now uses Handle_for<> +- SegmentH3 now uses Handle_for<> +- TetrahedronH3 now uses Handle_for<> +- TriangleH3 now uses Handle_for<> +- leading _ with FT,RT removed in Aff_transformationH3 + +2.6 (03 Apr 2000) + +- h?_ref() access added to PointH3 + +2.5 (30 Mar 2000) + +- Handle_for> used for PointH3, VectorH3, and DirectionH3 + +2.4 (16 Feb 2000) + +- Iso_cuboidH3 revised + Handle_for<> used in Iso_cuboidH3 + +%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 2 . 1 %%%%%%%%%%%%%%%%%%%%%%%%%%%% + +2.3.6 -> 2.3.7 (03 Dec 99) +- typename added before std::vector< PointH3 >::iterator + (detected by -pedantic with gcc-2.95) + +2.3.5 -> 2.3.6 (07 Nov 99) +- Identity + rep in Aff_transformationH3 + +2.3.4 -> 2.3.5 (08 Oct 99) +- DirectionH3::vector() replaced by DirectionH3::to_vector() + +2.3.3 -> 2.3.4 (17 Sep 99) +- distance_predicatesH3.h added + +2.3.2 -> 2.3.3 (14 Sep 99) +- -- + +2.3.1 -> 2.3.2 (01 Sep 99) +- qualified sign by CGAL:: + +2.3 -> 2.3.1 (09 Aug 99) +- coplanar_orientation(p,q,r,s) added + +2.2.1 -> 2.3 (04 Aug 99) +- updates/workarounds for gcc-2.95: + s/friend inline/friend CGAL_FRIEND_INLINE + s/friend CGAL_KERNEL_INLINE/friend CGAL_KERNEL_FRIEND_INLINE + made all operator-() friends non-friends in + +%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 2 . 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%% + +2.2 -> 2.2.1 (26 May 99) +- CGAL_KERNEL_INLINE added for declaration of cross_product on + DirectionH3 + +2.1.3 -> 2.2 (20 May 99) +- equality test for TetrahedronH3 fixed + +2.1.2 -> 2.1.3 (06 May 99) +- inline and CGAL_KERNEL_INLINE added to forward declarations in PVDH3.h + (external/internal linkage conflict warning by mips) + +2.1.1 -> 2.1.2 (28 Apr 99) +- sign() qualified by CGAL:: (PlaneH3) + +2.1 -> 2.1.1 (28 Apr 99) +- prefixed compare() by CGAL:: + +2.0.5 -> 2.1 (16 Apr 99) +- iostream parts prefixed by std:: + +2.0.4 -> 2.0.5 (30 Mar 99) +- to_double() prefixed by CGAL:: + +2.0.3 -> 2.0.4 (22 Mar 99) +- call of sign() DirectionH3::operator==( const DirectionH3& d) + 'prefixed' by CGAL:: + +2.0.2 -> 2.0.3 (20 Mar 99) +- flag CGAL_NO_NAMESPACE corrected + +2.0.1 -> 2.0.2 (14 Mar 99) +- std::swap used in code for bbox() + +2.0 -> 2.0.1 (24 Feb 99) +- CGAL_[BEGIN|END]_NAMESPACE used + +1.5 -> 2.0 +- namespace CGAL { } introduced + +%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 1 . 2 %%%%%%%%%%%%%%%%%%%%%%%%%%%% + +1.4 -> 1.5 +- Use of CGAL...INLINE made consistent between declarations and + definitions (otherwise SunPro CC 4.2 does not like it). + +1.3.1 -> 1.4 +- bug in CGAL_collinear_are_ordered_along_line(p,q,r) fixed; case p == r +- CGAL_PointH3< > operator-(const CGAL_Origin&, const CGAL_VectorH3< >&) + added +- warning in VectorH3::cartesian(int i) fixed + +%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 1 . 1 %%%%%%%%%%%%%%%%%%%%%%%%%%%% + +1.3 -> 1.3.1 +- bugs in PlaneH3::to_2d() and PlaneH3::to_3d() fixed + +1.2 -> 1.3 +- basic_constructionsH3.h extended (circumcenter) +- (strict_)order_along_line added/updated +- midpoint(p,q) added + +1.1.1 -> 1.2 +- side_of...sphere predicates added +- assert replaced by CGAL_kernel_assertion in TetrahedronH3.h + +%%%%%%%%%%%%%%%%%%%%%% R e l e a s e 1 . 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%% + +1.1. -> 1.1.1 +- basic_constructionsH3.h added +- PlaneH3::projection(...) added + +1.0.1 -> 1.1 +- made fit for egcs + +1.0 -> 1.0.1 +- predicates_on_pointsH3.h is now also included in LineH3.h + +0.9 -> 1.0 +- New access functions have been added to Aff_transformation. +- New inline policy is now used: There are several levels of + inlining to be defined in kernel_basic.h. +- typename keyword has been added +- warnings for `unreachable statements' should disappear diff --git a/Homogeneous_kernel/description.txt b/Homogeneous_kernel/description.txt new file mode 100644 index 00000000000..4fe30ef435d --- /dev/null +++ b/Homogeneous_kernel/description.txt @@ -0,0 +1 @@ +2D and 3D kernel with homogeneous representation diff --git a/H2/include/CGAL/Homogeneous.h b/Homogeneous_kernel/include/CGAL/Homogeneous.h similarity index 100% rename from H2/include/CGAL/Homogeneous.h rename to Homogeneous_kernel/include/CGAL/Homogeneous.h diff --git a/H2/include/CGAL/Homogeneous/Aff_transformationH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/Aff_transformationH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH2.h diff --git a/H3/include/CGAL/Homogeneous/Aff_transformationH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h similarity index 100% rename from H3/include/CGAL/Homogeneous/Aff_transformationH3.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h diff --git a/H2/include/CGAL/Homogeneous/CircleH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/CircleH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/CircleH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/CircleH2.h diff --git a/H2/include/CGAL/Homogeneous/Data_accessorH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Data_accessorH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/Data_accessorH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/Data_accessorH2.h diff --git a/H2/include/CGAL/Homogeneous/DirectionH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/DirectionH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h diff --git a/H3/include/CGAL/Homogeneous/DirectionH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH3.h similarity index 100% rename from H3/include/CGAL/Homogeneous/DirectionH3.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH3.h diff --git a/H2/include/CGAL/Homogeneous/Homogeneous_base.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h similarity index 100% rename from H2/include/CGAL/Homogeneous/Homogeneous_base.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h diff --git a/H3/include/CGAL/Homogeneous/Iso_cuboidH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h similarity index 100% rename from H3/include/CGAL/Homogeneous/Iso_cuboidH3.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h diff --git a/H2/include/CGAL/Homogeneous/Iso_rectangleH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/Iso_rectangleH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h diff --git a/H2/include/CGAL/Homogeneous/LineH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/LineH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h diff --git a/H3/include/CGAL/Homogeneous/PlaneH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/PlaneH3.h similarity index 100% rename from H3/include/CGAL/Homogeneous/PlaneH3.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/PlaneH3.h diff --git a/H2/include/CGAL/Homogeneous/PointH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/PointH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h diff --git a/H3/include/CGAL/Homogeneous/PointH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h similarity index 100% rename from H3/include/CGAL/Homogeneous/PointH3.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h diff --git a/H2/include/CGAL/Homogeneous/RayH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/RayH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/RayH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/RayH2.h diff --git a/H3/include/CGAL/Homogeneous/RayH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/RayH3.h similarity index 100% rename from H3/include/CGAL/Homogeneous/RayH3.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/RayH3.h diff --git a/H3/include/CGAL/Homogeneous/SphereH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/SphereH3.h similarity index 100% rename from H3/include/CGAL/Homogeneous/SphereH3.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/SphereH3.h diff --git a/H2/include/CGAL/Homogeneous/VectorH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/VectorH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h diff --git a/H3/include/CGAL/Homogeneous/VectorH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h similarity index 100% rename from H3/include/CGAL/Homogeneous/VectorH3.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h diff --git a/H2/include/CGAL/Homogeneous/basic_constructionsH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/basic_constructionsH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH2.h diff --git a/H3/include/CGAL/Homogeneous/basic_constructionsH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH3.h similarity index 100% rename from H3/include/CGAL/Homogeneous/basic_constructionsH3.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH3.h diff --git a/H2/include/CGAL/Homogeneous/distance_predicatesH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/distance_predicatesH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH2.h diff --git a/H3/include/CGAL/Homogeneous/distance_predicatesH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH3.h similarity index 100% rename from H3/include/CGAL/Homogeneous/distance_predicatesH3.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH3.h diff --git a/H2/include/CGAL/Homogeneous/function_objects.h b/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h similarity index 100% rename from H2/include/CGAL/Homogeneous/function_objects.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h diff --git a/H2/include/CGAL/Homogeneous/predicates_on_directionsH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_directionsH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/predicates_on_directionsH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_directionsH2.h diff --git a/H2/include/CGAL/Homogeneous/predicates_on_pointsH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/predicates_on_pointsH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH2.h diff --git a/H3/include/CGAL/Homogeneous/predicates_on_pointsH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH3.h similarity index 100% rename from H3/include/CGAL/Homogeneous/predicates_on_pointsH3.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH3.h diff --git a/H2/include/CGAL/Homogeneous/predicates_on_rtH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_rtH2.h similarity index 100% rename from H2/include/CGAL/Homogeneous/predicates_on_rtH2.h rename to Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_rtH2.h diff --git a/H2/include/CGAL/Homogeneous_converter.h b/Homogeneous_kernel/include/CGAL/Homogeneous_converter.h similarity index 100% rename from H2/include/CGAL/Homogeneous_converter.h rename to Homogeneous_kernel/include/CGAL/Homogeneous_converter.h diff --git a/H2/include/CGAL/Simple_homogeneous.h b/Homogeneous_kernel/include/CGAL/Simple_homogeneous.h similarity index 100% rename from H2/include/CGAL/Simple_homogeneous.h rename to Homogeneous_kernel/include/CGAL/Simple_homogeneous.h diff --git a/H2/maintainer b/Homogeneous_kernel/maintainer similarity index 100% rename from H2/maintainer rename to Homogeneous_kernel/maintainer diff --git a/Kernel_23/test/Kernel/makefile b/Kernel_23/test/Kernel/makefile index 745ba59477e..2cba13ce4b3 100644 --- a/Kernel_23/test/Kernel/makefile +++ b/Kernel_23/test/Kernel/makefile @@ -16,8 +16,7 @@ include $(CGAL_MAKEFILE) CXXFLAGS = \ -I../../include \ -I../../../Configuration/include \ - -I../../../H3/include \ - -I../../../H2/include \ + -I../../../Homogeneous_kernel/include \ -I../../../Cartesian_kernel/include \ -I../../../Number_types/include \ -I../../../Distance_2/include \ diff --git a/Maintenance/release_building/include_in_release b/Maintenance/release_building/include_in_release index 80d0a19456d..c3b6ca2b257 100644 --- a/Maintenance/release_building/include_in_release +++ b/Maintenance/release_building/include_in_release @@ -21,10 +21,9 @@ Distance_3 Fixed_precision_nt Generator Geomview -H2 -H3 HalfedgeDS Hash_map +Homogeneous_kernel Installation Interpolation Intersections_2