From 653a15e2b03aedda1cebb87ad27a0b70b9693301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Br=C3=B6nnimann?= Date: Thu, 7 Oct 1999 19:41:36 +0000 Subject: [PATCH] Version 3.3.7 (October 7 1999) - Various predicates and constructions cleanups and speedups [Sylvain]. - Changed vector to to_vector in Direction --- Old_Packages/C2/Makefile | 14 +++++++------- Old_Packages/C2/changes.txt | 3 ++- .../CGAL/Cartesian/Aff_transformation_rep_2.h | 2 +- .../C2/include/CGAL/Cartesian/Direction_2.C | 4 ++-- .../C2/include/CGAL/Cartesian/Direction_2.h | 2 +- Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C | 2 +- .../C2/include/CGAL/Cartesian/Rotation_rep_2.h | 6 +++--- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Old_Packages/C2/Makefile b/Old_Packages/C2/Makefile index 8f0ccd0a4b4..d61f91bc826 100644 --- a/Old_Packages/C2/Makefile +++ b/Old_Packages/C2/Makefile @@ -3,13 +3,13 @@ CVS_MODULE_NAME=C2 Package=C2 -.PHONY: Package Test Submit Version Rtag +.PHONY: package test submit version rtag WWW_base=/u/www/0/www/htdocs/files/equipes/prisme/CGAL/DR:/Members WWW_dir=$(WWW_base)/$(Package) TMP_file=/tmp/submit-mail -Package: clean $(Package).tar.gz +package: clean $(Package).tar.gz @echo "----------------------------------" @echo "------------ Penser à: -----------" @echo "----------------------------------" @@ -25,19 +25,19 @@ Package: clean $(Package).tar.gz symlinks: cd include/CGAL/Cartesian ; sh ./create_symlinks_2 -Test: +test: cd test/Kernel; ./cgal_test -Version: +version: echo "$(VERSION) (" `date +"%e %b %Y"` ")" > version -Commit: +commit: cvs commit -Rtag: +rtag: cvs rtag v`echo $(VERSION) | sed -e "s/\./_/g"` $(CVS_MODULE_NAME) -Submit: Package +submit: package cp $(Package).tar.gz version long_description.txt description.txt \ changes.txt $(WWW_dir) echo > $(TMP_file) diff --git a/Old_Packages/C2/changes.txt b/Old_Packages/C2/changes.txt index ee79b93a32f..3e6c7c0b593 100644 --- a/Old_Packages/C2/changes.txt +++ b/Old_Packages/C2/changes.txt @@ -1,5 +1,6 @@ - +Version 3.3.7 (October 7 1999) - Various predicates and constructions cleanups and speedups [Sylvain]. +- Changed vector to to_vector in Direction Version 3.3.6 (September 30 1999) - Forgot std:: qualifier for endl in Circle_2.C diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_rep_2.h b/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_rep_2.h index 838f608f6e2..66b82fc0579 100644 --- a/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_rep_2.h +++ b/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_rep_2.h @@ -123,7 +123,7 @@ friend class Scaling_repC2; // note that a direction is not translated Direction_2 transform(const Direction_2& dir) const { - Vector_2 v = dir.vector(); + Vector_2 v = dir.to_vector(); return Direction_2(t11 * v.x() + t12 * v.y(), t21 * v.x() + t22 * v.y()); } diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C index 27318034fab..bd62335d3b3 100644 --- a/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C +++ b/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C @@ -152,7 +152,7 @@ DirectionC2::counterclockwise_in_between template < class R > inline typename DirectionC2::Vector_2 -DirectionC2::vector() const +DirectionC2::to_vector() const { return Vector_2(*this); } @@ -220,7 +220,7 @@ template < class R > std::ostream &operator<<(std::ostream &os, const DirectionC2 &d) { - typename R::Vector_2 v = d.vector(); + typename R::Vector_2 v = d.to_vector(); switch(os.iword(IO::mode)) { case IO::ASCII : return os << v.x() << ' ' << v.y(); diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.h b/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.h index ecd9898a74d..6cccd9d0fb3 100644 --- a/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.h +++ b/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.h @@ -89,7 +89,7 @@ public: bool counterclockwise_in_between( const Self &d1, const Self &d2) const; int id() const; - Vector_2 vector() const; + Vector_2 to_vector() const; Self perpendicular(const Orientation &o) const; Self transform(const Aff_transformation_2 &t) const; diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C index 547efa9b859..26243303581 100644 --- a/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C +++ b/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C @@ -69,7 +69,7 @@ CGAL_KERNEL_CTOR_INLINE RayC2::RayC2(const typename RayC2::Point_2 &sp, const typename RayC2::Direction_2 &d) { - PTR = new _Twotuple(sp, sp + d.vector()); + PTR = new _Twotuple(sp, sp + d.to_vector()); } template < class R > diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Rotation_rep_2.h b/Old_Packages/C2/include/CGAL/Cartesian/Rotation_rep_2.h index 2c87da7aa40..04435c33cb9 100644 --- a/Old_Packages/C2/include/CGAL/Cartesian/Rotation_rep_2.h +++ b/Old_Packages/C2/include/CGAL/Cartesian/Rotation_rep_2.h @@ -64,8 +64,8 @@ public: FT cos_num; FT denom; - rational_rotation_approximation(d.vector().x(), - d.vector().y(), + rational_rotation_approximation(d.to_vector().x(), + d.to_vector().y(), sin_num, cos_num, denom, @@ -89,7 +89,7 @@ public: Direction_2 transform(const Direction_2 &d) const { - Vector_2 v = d.vector(); + Vector_2 v = d.to_vector(); return Direction_2(_cosinus * v.x() - _sinus * v.y(), _sinus * v.x() + _cosinus * v.y()); }