songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-> CGAL-2.2-I

This commit is contained in:
Tran Kai Frank Da 2000-07-11 15:52:15 +00:00
parent 5eec2f6f19
commit bee48eee51
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Packages/Alpha_shapes_2/changes.txt
View File

@ -1,3 +1,6 @@
version 8.0:
-> compatibility with CGAL-2.2-I
version 7.0:
-> New doc style.
@ -14,7 +17,7 @@ version 4.0:
Mips_IRIX_CC and Borland_CC supported.
version 3.0 :
stabilized version waiting for public release.
stabilised version waiting for public release.
version 2.0 :
new design more appropriated for weighted alpha shapes.
@ -32,7 +35,7 @@ Version 1.3 :
-> New Kernel.
Version 1.2 :
C++ "standardization".
C++ "standardisation".
Version 1.1 :
-> basic library.

2
Packages/Alpha_shapes_2/demo/Alpha_shapes_2/Makefile
View File

@ -5,7 +5,7 @@
#---------------------------------------------------------------------#
# Choose the right include file from the <cgalroot>/make directory.
CGAL_MAKEFILE = $(UTIL)/CGAL/CGAL-2.1/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA
CGAL_MAKEFILE = $(UTIL)/CGAL/CGAL-2.2-I-24/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA
#$(UTIL)/CGAL-I/make/makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA
#makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA

1
Packages/Alpha_shapes_2/demo/Alpha_shapes_2/weights_heuristic_2.h
View File

@ -89,7 +89,6 @@ public:
typedef typename Gt::Coord_type Coord_type;
typedef typename Gt::Point Point;
typedef typename Gt::Distance Distance;
typedef typename Gt::Ray Ray;
typedef typename Gt::Line Line;
typedef typename Gt::Direction Direction;

2
Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile
View File

@ -5,7 +5,7 @@
#---------------------------------------------------------------------#
# Choose the right include file from the <cgalroot>/make directory.
CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA
CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.2-I-24/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA
# for cygwin
#\prisme\CGAL\CGAL-2.1-I-30\make\makefile_i686_CYGWINNT-4.0-20.1_CL.EXE-12.00.8168

2
Packages/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h
View File

@ -80,12 +80,10 @@ public:
typedef typename Gt::Coord_type Coord_type;
typedef typename Gt::Point Point;
typedef typename Gt::Distance Distance;
typedef typename Gt::Ray Ray;
typedef typename Gt::Line Line;
typedef typename Gt::Direction Direction;
typedef typename Dt::Face_handle Face_handle;
typedef typename Dt::Vertex_handle Vertex_handle;
typedef typename Dt::Edge Edge;

2
Packages/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h
View File

@ -57,7 +57,7 @@ public:
typedef typename R::FT Coord_type;
typedef typename
Regular_triangulation_euclidean_traits_2<R, typename R::FT>::Point Point;
Regular_triangulation_euclidean_traits_2<R, typename R::FT>::Weighted_point Point;
//---------------------------------------------------------------------

10
Packages/Alpha_shapes_2/include/CGAL/constructions/squared_radius_smallest_orthogonalcircle_ftC2.h
View File

@ -46,8 +46,8 @@ squared_radius_orthogonalcircleC2(
FT dpy = py-ry;
FT dqx = qx-rx;
FT dqy = qy-ry;
FT dpp = square(dpx)+square(dpy)-pw+rw;
FT dqq = square(dqx)+square(dqy)-qw+rw;
FT dpp = CGAL_NTS square(dpx)+CGAL_NTS square(dpy)-pw+rw;
FT dqq = CGAL_NTS square(dqx)+CGAL_NTS square(dqy)-qw+rw;
FT det0 = det2x2_by_formula(dpx, dpy, dqx, dqy);
@ -55,7 +55,7 @@ squared_radius_orthogonalcircleC2(
FT det2 = det2x2_by_formula(dpx, dpp, dqx, dqq);
return (square(det1)+square(det2))/(FT4*square(det0)) - rw;
return (CGAL_NTS square(det1)+CGAL_NTS square(det2))/(FT4*CGAL_NTS square(det0)) - rw;
}
template< class FT >
@ -67,9 +67,9 @@ squared_radius_smallest_orthogonalcircleC2(
{
FT FT4(4);
FT dpz = square(px-qx)+square(py-qy);
FT dpz = CGAL_NTS square(px-qx)+CGAL_NTS square(py-qy);
return (square(dpz-pw+qw)/(FT4*dpz)-qw);
return (CGAL_NTS square(dpz-pw+qw)/(FT4*dpz)-qw);
}
//-------------------------------------------------------------------

4
Packages/Alpha_shapes_2/include/CGAL/predicates/in_smallest_orthogonalcircle_ftC2.h
View File

@ -43,9 +43,9 @@ in_smallest_orthogonalcircleC2(const FT &px, const FT &py, const FT &pw,
FT dpy = py-qy;
FT dtx = tx-qx;
FT dty = ty-qy;
FT dpz = square(dpx)+square(dpy);
FT dpz = CGAL_NTS square(dpx)+CGAL_NTS square(dpy);
return Bounded_side (CGAL::sign(-(square(dtx)+square(dty)-tw+qw)*dpz
return Bounded_side (CGAL_NTS sign(-(CGAL_NTS square(dtx)+CGAL_NTS square(dty)-tw+qw)*dpz
+(dpz-pw+qw)*(dpx*dtx+dpy*dty)));
}

2
Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile
View File

@ -5,7 +5,7 @@
#---------------------------------------------------------------------#
# Choose the right include file from the <cgalroot>/make directory.
CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA
CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.2-I-24/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA
# for cygwin
#\prisme\CGAL\CGAL-2.1-I-30\make\makefile_i686_CYGWINNT-4.0-20.1_CL.EXE-12.00.8168

2
Packages/Alpha_shapes_2/version
View File

@ -1,2 +1,2 @@
7.2 (14 Apr 2000)
8.0 (11 Jul 2000)
Maintainer : Frank Da <Frank.Da@sophia.inria.fr>