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

now CGAL-2.2-I

This commit is contained in:
Tran Kai Frank Da 2000-02-04 12:56:06 +00:00
parent 7958b8103e
commit 9cb221ab1f
9 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Packages/Alpha_shapes_2/changes.txt
View File

@ -1,3 +1,9 @@
version 6.0:
And now CGAL-2.2-I...
version 5.5:
This one for CGAL-2.1
version 5.0: version 5.0:
Ready now... Ready now...

4
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. # Choose the right include file from the <cgalroot>/make directory.
CGAL_MAKEFILE = $(UTIL)/CGAL/CGAL-2.1-I-44/make/makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA CGAL_MAKEFILE = $(UTIL)/CGAL/CGAL-2.1/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 #$(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 #makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA
@ -22,7 +22,7 @@ include $(CGAL_MAKEFILE)
#----------------------------------------------------------------------# #----------------------------------------------------------------------#
# rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local # rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local
CXXFLAGS = -I$(HOME)/Cgal-2.0/To_submit/Alpha_shapes_2/include \ CXXFLAGS = -I$(HOME)/Cgal-I/For_Submission/Alpha_shapes_2/include \
$(CGAL_CXXFLAGS) \ $(CGAL_CXXFLAGS) \
-mcpu=ultrasparc -mtune=ultrasparc -O2 \ -mcpu=ultrasparc -mtune=ultrasparc -O2 \
-B /u/alcor/0/prisme_util/Binutils/SunOS/bin/ -B /u/alcor/0/prisme_util/Binutils/SunOS/bin/

4
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. # Choose the right include file from the <cgalroot>/make directory.
CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1-I-44/make/makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA
# for cygwin # for cygwin
#\prisme\CGAL\CGAL-2.1-I-30\make\makefile_i686_CYGWINNT-4.0-20.1_CL.EXE-12.00.8168 #\prisme\CGAL\CGAL-2.1-I-30\make\makefile_i686_CYGWINNT-4.0-20.1_CL.EXE-12.00.8168
@ -26,7 +26,7 @@ include $(CGAL_MAKEFILE)
#----------------------------------------------------------------------# #----------------------------------------------------------------------#
# rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local # rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local
CXXFLAGS = -I$(HOME)/Cgal-2.0/To_submit/Alpha_shapes_2/include \ CXXFLAGS = -I$(HOME)/Cgal-I/For_Submission/Alpha_shapes_2/include \
$(CGAL_CXXFLAGS) \ $(CGAL_CXXFLAGS) \
-mcpu=ultrasparc -mtune=ultrasparc -O2 \ -mcpu=ultrasparc -mtune=ultrasparc -O2 \
-B /u/alcor/0/prisme_util/Binutils/SunOS/bin/ -B /u/alcor/0/prisme_util/Binutils/SunOS/bin/

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

@ -25,7 +25,7 @@ include $(CGAL_MAKEFILE)
#----------------------------------------------------------------------# #----------------------------------------------------------------------#
# rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local # rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local
CXXFLAGS = '-Iz:\Cgal-2.0\To_submit\Alpha_shapes_2\include' \ CXXFLAGS = '-Iz:\Cgal-I\For_Submission\Alpha_shapes_2\include' \
$(TESTSUITE_CXXFLAGS) $(CGAL_CXXFLAGS) \ $(TESTSUITE_CXXFLAGS) $(CGAL_CXXFLAGS) \
# for cygwin # for cygwin

4
Packages/Alpha_shapes_2/include/CGAL/smallest_radiusH2.h
View File

@ -36,12 +36,12 @@ inline squared_radius_circumcircle(const PointH2<FT,RT> &p,
// compute the smallest radius directly // compute the smallest radius directly
if (orientation(p, q, r) == COLLINEAR) if (orientation(p, q, r) == COLLINEAR)
// what do we do // what do we do
return R_FT_return(R)(0); return typename R::FT (0);
else else
{ {
Circle_2<R> c(p, q, r); Circle_2<R> c(p, q, r);
return R_FT_return(R)(c.squared_radius()); return typename R::FT (c.squared_radius());
} }
} }

14
Packages/Alpha_shapes_2/include/CGAL/smallest_radius_2.h
View File

@ -42,9 +42,9 @@ CGAL_BEGIN_NAMESPACE
template <class R > template <class R >
inline inline
R_FT_return(R) typename R::FT
squared_radius_smallest_circumcircle(const Point_2<R> &p, squared_radius_smallest_circumcircle(const Point_2<R> &p,
const Point_2<R> &q) const Point_2<R> &q)
{ {
typedef typename R::FT Return_type; typedef typename R::FT Return_type;
Vector_2<R> v(p - q); Vector_2<R> v(p - q);
@ -53,10 +53,10 @@ R_FT_return(R)
template <class R > template <class R >
inline inline
R_FT_return(R) typename R::FT
squared_radius_circumcircle(const Point_2<R> &p, squared_radius_circumcircle(const Point_2<R> &p,
const Point_2<R> &q, const Point_2<R> &q,
const Point_2<R> &r) const Point_2<R> &r)
{ {
typedef typename R::Point_2_base Point_two; typedef typename R::Point_2_base Point_two;
// compute the smallest radius directly // compute the smallest radius directly

4
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. # Choose the right include file from the <cgalroot>/make directory.
CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1-I-44/make/makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA
# for cygwin # for cygwin
#\prisme\CGAL\CGAL-2.1-I-30\make\makefile_i686_CYGWINNT-4.0-20.1_CL.EXE-12.00.8168 #\prisme\CGAL\CGAL-2.1-I-30\make\makefile_i686_CYGWINNT-4.0-20.1_CL.EXE-12.00.8168
@ -26,7 +26,7 @@ include $(CGAL_MAKEFILE)
#----------------------------------------------------------------------# #----------------------------------------------------------------------#
# rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local # rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local
CXXFLAGS = -I$(HOME)/Cgal-2.0/To_submit/Alpha_shapes_2/include \ CXXFLAGS = -I$(HOME)/Cgal-I/For_Submission/Alpha_shapes_2/include \
$(CGAL_CXXFLAGS) -O2 \ $(CGAL_CXXFLAGS) -O2 \
-mcpu=ultrasparc -mtune=ultrasparc \ -mcpu=ultrasparc -mtune=ultrasparc \
-B /u/alcor/0/prisme_util/Binutils/SunOS/bin/ -B /u/alcor/0/prisme_util/Binutils/SunOS/bin/

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

@ -25,7 +25,7 @@ include $(CGAL_MAKEFILE)
#----------------------------------------------------------------------# #----------------------------------------------------------------------#
# rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local # rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local
CXXFLAGS = '-Iz:\Cgal-2.0\To_submit\Alpha_shapes_2\include' \ CXXFLAGS = '-Iz:\Cgal-I\For_Submission\Alpha_shapes_2\include' \
$(TESTSUITE_CXXFLAGS) $(CGAL_CXXFLAGS) \ $(TESTSUITE_CXXFLAGS) $(CGAL_CXXFLAGS) \
# for cygwin # for cygwin

2
Packages/Alpha_shapes_2/version
View File

@ -1 +1 @@
5.5 (16 Dec 1999) 6.0 ( 4 Feb 2000)