*** empty log message ***

This commit is contained in:
Monique Teillaud 2000-12-22 16:40:54 +00:00
parent 217e4090d6
commit dba96190ea
6 changed files with 32 additions and 41 deletions

View File

@ -59,6 +59,8 @@ $(Package).tar.gz:
--exclude=.pure --exclude=*.pv \
--exclude=.nfs*\
--exclude=HTML_TEST \
--exclude=test_triangulation_geom_traits.C \
--exclude=test_triangulation_regular_traits.C\
version maintainer description.txt changes.txt \
demo include doc_tex doc_ps src test examples

View File

@ -1,4 +1,4 @@
Version 1.45 (?? dec 00)
Version 1.45 (22 dec 00)
- point() of vertex_base returns a const ref instead of a Point. [syl]
- locate() improvements (remembering). [syl]
- new typdefs Geom_traits and Triangulation_data_structure.

View File

@ -168,12 +168,10 @@ by \cgal, a class must provide definitions for the \textit{power tests}.
We use here the same notation as in
Section~\ref{Triangulation3-sec-class-Regulartriangulation}.
\ccNestedType{Power_test_3}{Predicate object. Must provide the following
operators:
\ccNestedType{Power_test_3}{Predicate object.
Must provide the following operators:}
\ccc{Oriented_side operator()( Weighted_point p,
\ccMethod{Oriented_side operator()( Weighted_point p,
Weighted_point q,
Weighted_point r,
Weighted_point s,
@ -193,7 +191,7 @@ to 0, then
\ccc{power_test(p,q,r,s,t)} = \ccc{side_of_oriented_sphere(p,q,r,s,t)}.
\ccc{Oriented_side operator()( Weighted_point p,
\ccMethod{Oriented_side operator()( Weighted_point p,
Weighted_point q,
Weighted_point r,
Weighted_point t) ;}
@ -205,7 +203,7 @@ coplanar.}}
If all the points have a weight equal to 0, then
\ccc{power_test(p,q,r,s,t)} = \ccc{side_of_oriented_circle(p,q,r,s,t)}.
\ccc{Oriented_side operator()( Weighted_point p,
\ccMethod{Oriented_side operator()( Weighted_point p,
Weighted_point q,
Weighted_point t) ;}
{Same for collinear points, where ${z(p,q)}^{(w)}$ is the
@ -216,8 +214,7 @@ power segment of \ccc{p} and \ccc{q}.
If all the points have a weight equal to 0, then
\ccc{power_test(p,q,t)} gives the same answer as the kernel predicate
\ccc{s(p,q).has_on(t)} would give, where \ccc{s(p,q)} denotes the
segment with endpoints \ccc{p} and \ccc{q}.}
segment with endpoints \ccc{p} and \ccc{q}.
\ccCreation
@ -237,7 +234,7 @@ Only a default constructor is required.
\ccHeading{Predicate functions}
The following functions give access to the predicate
and constructor objects.
\ccThree{Construct_segment_3}{gt.compare_x(Point p0, Point p1)x}{}
\ccThree{coplanar_side_of_oriented_circle_3}{gt.compare_x(Point p0, Point p1)x}{}
%
\ccMethod{Construct_segment_3 construct_segment_3_object();}{}
\ccGlue
@ -257,12 +254,9 @@ and constructor objects.
\ccGlue
\ccMethod{Coplanar_orientation_3 coplanar_orientation_3_object();}{}
\ccGlue
\ccMethod{Side_of_oriented_sphere_3 side_of_oriented_sphere_3_object();}{}
\ccGlue
\ccMethod{{Side_of_oriented_sphere_3 side_of_oriented_sphere_3_object();}{}
\ccGlue
\ccGlue
\ccMethod{coplanar_side_of_oriented_circle_3 coplanar_side_of_oriented_circle_3_object();}{}
\ccGlue
\ccMethod{Coplanar_side_of_oriented_circle_3 coplanar_side_of_oriented_circle_3_object();}{}
\ccGlue
\ccMethod{Power_test_3 power_test_3_object();}{}
\ccGlue

View File

@ -168,12 +168,10 @@ by \cgal, a class must provide definitions for the \textit{power tests}.
We use here the same notation as in
Section~\ref{Triangulation3-sec-class-Regulartriangulation}.
\ccNestedType{Power_test_3}{Predicate object. Must provide the following
operators:
\ccNestedType{Power_test_3}{Predicate object.
Must provide the following operators:}
\ccc{Oriented_side operator()( Weighted_point p,
\ccMethod{Oriented_side operator()( Weighted_point p,
Weighted_point q,
Weighted_point r,
Weighted_point s,
@ -193,7 +191,7 @@ to 0, then
\ccc{power_test(p,q,r,s,t)} = \ccc{side_of_oriented_sphere(p,q,r,s,t)}.
\ccc{Oriented_side operator()( Weighted_point p,
\ccMethod{Oriented_side operator()( Weighted_point p,
Weighted_point q,
Weighted_point r,
Weighted_point t) ;}
@ -205,7 +203,7 @@ coplanar.}}
If all the points have a weight equal to 0, then
\ccc{power_test(p,q,r,s,t)} = \ccc{side_of_oriented_circle(p,q,r,s,t)}.
\ccc{Oriented_side operator()( Weighted_point p,
\ccMethod{Oriented_side operator()( Weighted_point p,
Weighted_point q,
Weighted_point t) ;}
{Same for collinear points, where ${z(p,q)}^{(w)}$ is the
@ -216,8 +214,7 @@ power segment of \ccc{p} and \ccc{q}.
If all the points have a weight equal to 0, then
\ccc{power_test(p,q,t)} gives the same answer as the kernel predicate
\ccc{s(p,q).has_on(t)} would give, where \ccc{s(p,q)} denotes the
segment with endpoints \ccc{p} and \ccc{q}.}
segment with endpoints \ccc{p} and \ccc{q}.
\ccCreation
@ -237,7 +234,7 @@ Only a default constructor is required.
\ccHeading{Predicate functions}
The following functions give access to the predicate
and constructor objects.
\ccThree{Construct_segment_3}{gt.compare_x(Point p0, Point p1)x}{}
\ccThree{coplanar_side_of_oriented_circle_3}{gt.compare_x(Point p0, Point p1)x}{}
%
\ccMethod{Construct_segment_3 construct_segment_3_object();}{}
\ccGlue
@ -257,12 +254,9 @@ and constructor objects.
\ccGlue
\ccMethod{Coplanar_orientation_3 coplanar_orientation_3_object();}{}
\ccGlue
\ccMethod{Side_of_oriented_sphere_3 side_of_oriented_sphere_3_object();}{}
\ccGlue
\ccMethod{{Side_of_oriented_sphere_3 side_of_oriented_sphere_3_object();}{}
\ccGlue
\ccGlue
\ccMethod{coplanar_side_of_oriented_circle_3 coplanar_side_of_oriented_circle_3_object();}{}
\ccGlue
\ccMethod{Coplanar_side_of_oriented_circle_3 coplanar_side_of_oriented_circle_3_object();}{}
\ccGlue
\ccMethod{Power_test_3 power_test_3_object();}{}
\ccGlue

View File

@ -5,7 +5,7 @@
# Choose the right include file from the <cgalroot>/make directory.
# pour purify, virer LEDA
#CGAL_MAKEFILE = /0/prisme_util/CGAL/CGAL-2.2-I-26/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA
CGAL_MAKEFILE = /0/prisme_util/CGAL/CGAL-2.3-I-19/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA
#CGAL_MAKEFILE = /0/prisme_util/CGAL/CGAL-I/make/makefile_i686_Linux-2.2.7_g++-2.95.1_LEDA
include $(CGAL_MAKEFILE)
@ -49,19 +49,20 @@ LDFLAGS = $(TESTSUITE_LDFLAGS) \
# target entries
#---------------------------------------------------------------------#
all: test_triangulation_geom_traits test_triangulation_tds \
all: test_triangulation_tds \
test_triangulation_3 test_delaunay_3 \
test_triangulation_regular_traits test_regular_3
./test_triangulation_geom_traits
test_regular_3
# test_triangulation_geom_traits test_triangulation_regular_traits
# ./test_triangulation_geom_traits
./test_triangulation_tds
./test_triangulation_3
./test_delaunay_3
./test_triangulation_regular_traits
# ./test_triangulation_regular_traits
./test_regular_3
# -B$(UTIL)/Binutils/$(UNAME)/bin/ \
test_triangulation_geom_traits : test_triangulation_geom_traits.o
$(CGAL_CXX) -o test_triangulation_geom_traits test_triangulation_geom_traits.o $(LDFLAGS)
#test_triangulation_geom_traits : test_triangulation_geom_traits.o
# $(CGAL_CXX) -o test_triangulation_geom_traits test_triangulation_geom_traits.o $(LDFLAGS)
test_triangulation_tds: ../../src/Triangulation_3.o test_triangulation_tds.o
$(CGAL_CXX) -o test_triangulation_tds Triangulation_3.o test_triangulation_tds.o $(LDFLAGS)
@ -72,8 +73,8 @@ test_triangulation_3: ../../src/Triangulation_3.o test_triangulation_3.o
test_delaunay_3: ../../src/Triangulation_3.o test_delaunay_3.o
$(CGAL_CXX) -o test_delaunay_3 Triangulation_3.o test_delaunay_3.o $(LDFLAGS)
test_triangulation_regular_traits: test_triangulation_regular_traits.o
$(CGAL_CXX) -o test_triangulation_regular_traits test_triangulation_regular_traits.o $(LDFLAGS)
#test_triangulation_regular_traits: test_triangulation_regular_traits.o
# $(CGAL_CXX) -o test_triangulation_regular_traits test_triangulation_regular_traits.o $(LDFLAGS)
test_regular_3: ../../src/Triangulation_3.o test_regular_3.o
$(CGAL_CXX) -o test_regular_3 Triangulation_3.o test_regular_3.o $(LDFLAGS)

View File

@ -1 +1 @@
1.44 (11 Dec 2000)
1.45 (22 Dec 2000)