Cleaned up headers

This commit is contained in:
Hervé Brönnimann 1999-11-22 13:44:13 +00:00
parent 34e9db93c6
commit c156c40b59
14 changed files with 644 additions and 308 deletions

View File

@ -45,8 +45,12 @@ clean:
rm -f $(Package).tar.gz
$(Package).tar.gz:
./check_headers.pl -u include/CGAL/*.[Ch]
./check_headers.pl -u include/CGAL/*/*.[Ch]
tar -zcvf $(Package).tar.gz \
--exclude=CVS --exclude=wrapper.tex --exclude=Makefile \
--exclude=TODO \
version long_description.txt description.txt changes.txt \
include
./check_headers.pl -u include/CGAL/*.[Ch]
./check_headers.pl -u include/CGAL/*/*.[Ch]

View File

@ -1,6 +1,9 @@
Version 3.3.7 (?? ?? 1999)
Version 3.3.7 (November 22 1999)
- Added missing headers [syl].
- Remove protect macros [syl].
- Cleaned up some useless include <Kernel/...> [Hervé]
- Shorter headers in CVS repository, but complete for release
thanks to script for submission
Version 3.3.6 (October 7 1999)
- Removed CVS conflict in Cartesian (was submitted in 3.3.5)

View File

@ -0,0 +1,240 @@
#!/usr/local/bin/perl -w
use strict;
#use Cwd;
use File::Copy;
#use File::Basename;
#use File::Find;
use Getopt::Std;
my ($authors,$revision,$revision_date);
#
# This script Checks if a file header complies to the CGAL rules.
sub usage()
{
print STDERR<<'EOF';
usage: $0 (-h|-u|-c) file1 ...
Exactly one of the options -h, -u and -c must be present.
-h show this message and quit
-u update headers
-c check but do no updates
EOF
}
sub gjmove($$)
{
return 1 if rename($_[0], $_[1] );
return (system('mv', "$_[0]", "$_[1]") == 0);
}
#----------------------------------------------------------------#
# initialization #
#----------------------------------------------------------------#
my $TEMPFILE;
sub print_license()
{
print TEMPFILE <<'END_OF_LICENSE';
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
END_OF_LICENSE
}
#----------------------------------------------------------------#
# add_header #
#
#
#----------------------------------------------------------------#
sub add_header($$$$$$$)
{
my ($version, $date, $package, $full_filename, $revision, $revision_date, $authors) = @_;
$version = "" if (!defined($version));
$package = "" if (!defined($package));
my $year = `date '+%Y'`;
chomp $year;
print TEMPFILE "// ", '=' x 70,"\n";
print TEMPFILE "//\n";
print TEMPFILE "// Copyright \(c\) $year The CGAL Consortium\n";
print_license;
print TEMPFILE "// ", '-' x 70,"\n";
print TEMPFILE <<"END_OF_HEADER";
//
// release : $version
// release_date : $date//
// file : $full_filename
// package : $package
$revision$revision_date$authors// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann\@sophia.inria.fr)
//
END_OF_HEADER
print TEMPFILE "// ", '=' x 70,"\n";
while( <SOURCE_FILE> ) {
print TEMPFILE $_ if !m<^\s*//\s*revision_date\s*:>
&& !m<^\s*//\s*revision\s*:>
&& !m<^\s*//\s*author(s|\(s\))?\s*:>;
}
}
sub remove_header()
{
my $no_header = 0;
while( <SOURCE_FILE> ) {
$no_header=1 if !m<^\s*//>;
print TEMPFILE $_ if $no_header
|| m<^\s*//\s*revision_date\s*:>
|| m<^\s*//\s*revision\s*:>
|| m<^\s*//\s*author(s|\(s\))?\s*:>;
}
}
#----------------------------------------------------------------#
# check_and_update_2 #
#----------------------------------------------------------------#
sub check_and_update_2($$$$)
{
my ($version, $date, $package, $filename) = @_;
my $status=0;
# 0: no header 1: required header 2: header
my ($authors_seen, $revision_seen, $revision_date_seen) = (0,0,0);
while ( <SOURCE_FILE> ) {
++$authors_seen if m<^\s*//\s*author(s|\(s\))?\s*:>;
$authors = $_ if m<^\s*//\s*author(s|\(s\))?\s*:>;
++$revision_seen if m<^\s*//\s*revision\s*:>;
$revision = $_ if m<^\s*//\s*revision\s*:>;
++$revision_date_seen if m<^\s*//\s*revision_date\s*:>;
$revision_date = $_ if m<^\s*//\s*revision_date\s*:>;
$status = 2 if m<\s*//\s==========>;
$status = 2 if m<\s*//\s*Copyright>;
$status = 2 if m<\s*//\s*release\s*:>;
$status = 2 if m<\s*//\s*release\s*:>;
$status = 2 if m<\s*//\s*release_date\s*:>;
$status = 2 if m<\s*//\s*file\s*:>;
$status = 2 if m<\s*//\s*package\s*:>;
$status = 2 if m<\s*//\s*coordinator\s*:>;
print TEMPFILE $_;
}
if ($revision_seen == 0) {
print FILE_CHECKS
"$filename: revision field missing in header.\n";
print TEMPFILE "// revision : ?\n";
} elsif ($revision_seen > 1) {
print FILE_CHECKS
"$filename: Multiple revision fields in header.\n";
}
if ($revision_date_seen == 0) {
print FILE_CHECKS
"$filename: revision_date field missing in header.\n";
print TEMPFILE "// revision_date : ?\n";
} elsif ($revision_date_seen > 1) {
print FILE_CHECKS
"$filename: Multiple revision_date fields in header.\n";
}
if ($authors_seen == 0) {
print FILE_CHECKS
"$filename: authors field missing in header.\n";
print TEMPFILE "// author(s) : ?\n";
} elsif ($authors_seen > 1) {
print FILE_CHECKS
"$filename: Multiple authors fields in header.\n";
}
if ($status==0 && $authors_seen==1 && $revision_seen==1 && $revision_date_seen==1) {
$status=1;
}
my ($lines_exceeding_length, $has_line_directives) = (0, 0);
while ( <SOURCE_FILE> ) {
$lines_exceeding_length +=1 if length $_ > 80;
$has_line_directives = 1 if m|^\s*#\s*line\s|;
print TEMPFILE $_;
}
if ($lines_exceeding_length) {
print FILE_CHECKS
"$filename has $lines_exceeding_length",
" lines over 80 characters.\n";
}
if ($has_line_directives) {
print FILE_CHECKS "$filename has line directives.\n";
}
return $status;
}
sub check_and_update_file($$$$)
{
my ($filename, $version, $date, $package) = @_;
my $check_status;
open SOURCE_FILE, "<$filename" || die "Error opening $filename: $!\n";
open TEMPFILE, ">$TEMPFILE" || die;
$check_status =check_and_update_2($version, $date, $package, $filename);
close SOURCE_FILE || die "Error closing $filename: $!";
close TEMPFILE || die "Error closing temporary file: $!\n";
if ($check_status == 1) {
print FILE_CHECKS "Completing header for $filename.\n";
open SOURCE_FILE, "<$filename"
|| die "Error opening $filename: $!\n";
open TEMPFILE, ">$TEMPFILE" || die;
add_header($version, $date, $package, $filename, $revision, $revision_date, $authors);
close SOURCE_FILE || die "Error closing $filename: $!";
close TEMPFILE || die "Error closing temporary file: $!\n";
} elsif ($check_status == 2) {
print FILE_CHECKS "Stripping header for $filename.\n";
open SOURCE_FILE, "<$filename"
|| die "Error opening $filename: $!\n";
open TEMPFILE, ">$TEMPFILE" || die;
remove_header();
close SOURCE_FILE || die "Error closing $filename: $!";
close TEMPFILE || die "Error closing temporary file: $!\n";
}
if ($::opt_u) {
gjmove($TEMPFILE, $filename )
|| warn "Could not update file $filename\n";
}
}
#$::PARENT_DIR=cwd();
sub main()
{
umask(002);
my $version = `cat version`;
my $date=`date +"%-e %b %Y"`;
$version=~s/ (.*)\s*$//;
getopts('hucv:d:p:');
if ($::opt_h ) {
usage;
return;
}
$::opt_h = 0;
if ($::opt_u and $::opt_c) {
usage;
die "Both -c and -u option present\n";
}
if ($::opt_u ) {
$TEMPFILE="tmp.$$";
} else { # no updates, only checking
die if !$::opt_c; # mainly put here for shutting up warnings
$TEMPFILE="/dev/null";
}
open FILE_CHECKS, ">-";
my $filename;
foreach $filename (@ARGV) {
check_and_update_file($filename, $version, $date, "Cartesian_basic ($version)");
}
close FILE_CHECKS;
}
main;

View File

@ -1,24 +1,6 @@
// ============================================================================
//
// Copyright (c) 1999 The CGAL Consortium
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// ----------------------------------------------------------------------------
//
// release :
// release_date :
//
// file : include/CGAL/Cartesian_2.h
// revision : $Revision$
// revision_date : $Date$
// author(s) : Herve Bronnimann
//
// coordinator : INRIA Sophia-Antipolis
//
// ============================================================================
#ifndef CGAL_CARTESIAN_2_H
#define CGAL_CARTESIAN_2_H
@ -29,12 +11,7 @@
#ifdef CGAL_CFG_NO_ADVANCED_KERNEL
// Because we cannot use Michael's scheme, we need the wrapper classes
// We include them (they are common to Cartesian and Homogeneous)
#ifndef CGAL_USER_CLASSES_H
#include <CGAL/user_classes.h>
#endif // CGAL_USER_CLASSES_H
// Forgotten in user_classes, for CGAL-2.0!!!
// #warning "Forgotten classes in <CGAL/user_class.h> "
// template <class R > class Circle_2;
#endif // CGAL_CFG_NO_ADVANCED_KERNEL
#define CGAL_REP_CLASS_DEFINED

View File

@ -1,24 +1,6 @@
// ============================================================================
//
// Copyright (c) 1998, 1999 The CGAL Consortium
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// ----------------------------------------------------------------------------
//
// release :
// release_date :
//
// file : include/CGAL/Cartesian_3.h
// revision : $Revision$
// revision_date : $Date$
// author(s) : Herve Bronnimann
//
// coordinator : INRIA Sophia-Antipolis
//
// ============================================================================
#ifndef CGAL_CARTESIAN_3_H
#define CGAL_CARTESIAN_3_H
@ -150,39 +132,39 @@ struct Cartesian_3 :
public Cartesian_base_3< Cartesian_3<_FT>, _FT >
{
// Number types and representation tag
typedef _FT RT;
typedef _FT FT;
typedef Cartesian_tag Rep_tag;
typedef _FT RT;
typedef _FT FT;
typedef Cartesian_tag Rep_tag;
typedef Cartesian_3<_FT> Self;
typedef Cartesian_base_3<Self,_FT> Kernel_base;
typedef Cartesian_3<_FT> Self;
typedef Cartesian_base_3<Self,_FT> Kernel_base;
#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
// The other classes are inherited and because of partial specialization,
// Cartesian_3<FT>::Point_3 is exactly CGAL::Point_3< Cartesian_3<FT> >
// We still need to inherit explicitly, see Cartesian.h for explanation
typedef typename Kernel_base::Point_2 Point_2;
typedef typename Kernel_base::Vector_2 Vector_2;
typedef typename Kernel_base::Direction_2 Direction_2;
typedef typename Kernel_base::Segment_2 Segment_2;
typedef typename Kernel_base::Line_2 Line_2;
typedef typename Kernel_base::Ray_2 Ray_2;
typedef typename Kernel_base::Triangle_2 Triangle_2;
typedef typename Kernel_base::Circle_2 Circle_2;
typedef typename Kernel_base::Iso_rectangle_2 Iso_rectangle_2;
typedef typename Kernel_base::Aff_transformation_2 Aff_transformation_2;
typedef typename Kernel_base::Point_2 Point_2;
typedef typename Kernel_base::Vector_2 Vector_2;
typedef typename Kernel_base::Direction_2 Direction_2;
typedef typename Kernel_base::Segment_2 Segment_2;
typedef typename Kernel_base::Line_2 Line_2;
typedef typename Kernel_base::Ray_2 Ray_2;
typedef typename Kernel_base::Triangle_2 Triangle_2;
typedef typename Kernel_base::Circle_2 Circle_2;
typedef typename Kernel_base::Iso_rectangle_2 Iso_rectangle_2;
typedef typename Kernel_base::Aff_transformation_2 Aff_transformation_2;
typedef typename Kernel_base::Point_3 Point_3;
typedef typename Kernel_base::Vector_3 Vector_3;
typedef typename Kernel_base::Direction_3 Direction_3;
typedef typename Kernel_base::Line_3 Line_3;
typedef typename Kernel_base::Plane_3 Plane_3;
typedef typename Kernel_base::Ray_3 Ray_3;
typedef typename Kernel_base::Segment_3 Segment_3;
typedef typename Kernel_base::Triangle_3 Triangle_3;
typedef typename Kernel_base::Tetrahedron_3 Tetrahedron_3;
typedef typename Kernel_base::Aff_transformation_3 Aff_transformation_3;
typedef typename Kernel_base::Point_3 Point_3;
typedef typename Kernel_base::Vector_3 Vector_3;
typedef typename Kernel_base::Direction_3 Direction_3;
typedef typename Kernel_base::Line_3 Line_3;
typedef typename Kernel_base::Plane_3 Plane_3;
typedef typename Kernel_base::Ray_3 Ray_3;
typedef typename Kernel_base::Segment_3 Segment_3;
typedef typename Kernel_base::Triangle_3 Triangle_3;
typedef typename Kernel_base::Tetrahedron_3 Tetrahedron_3;
typedef typename Kernel_base::Aff_transformation_3 Aff_transformation_3;
#else
// Now CGAL::Point_3<R> is only a wrapper around CGAL::PointC3<R>
@ -192,56 +174,56 @@ struct Cartesian_3 :
// Cartesian_3<FT>::Base is needed so that CGAL::Point_3< Cartesian_3<FT> >
// can inherit from Cartesian_3<FT>::typename Kernel_base::Point_3
typedef typename Kernel_base::Point_2 Point_2_base;
typedef typename Kernel_base::Vector_2 Vector_2_base;
typedef typename Kernel_base::Direction_2 Direction_2_base;
typedef typename Kernel_base::Segment_2 Segment_2_base;
typedef typename Kernel_base::Line_2 Line_2_base;
typedef typename Kernel_base::Ray_2 Ray_2_base;
typedef typename Kernel_base::Triangle_2 Triangle_2_base;
typedef typename Kernel_base::Circle_2 Circle_2_base;
typedef typename Kernel_base::Iso_rectangle_2 Iso_rectangle_2_base;
typedef typename Kernel_base::Aff_transformation_2 Aff_transformation_2_base;
typedef typename Kernel_base::Point_2 Point_2_base;
typedef typename Kernel_base::Vector_2 Vector_2_base;
typedef typename Kernel_base::Direction_2 Direction_2_base;
typedef typename Kernel_base::Segment_2 Segment_2_base;
typedef typename Kernel_base::Line_2 Line_2_base;
typedef typename Kernel_base::Ray_2 Ray_2_base;
typedef typename Kernel_base::Triangle_2 Triangle_2_base;
typedef typename Kernel_base::Circle_2 Circle_2_base;
typedef typename Kernel_base::Iso_rectangle_2 Iso_rectangle_2_base;
typedef typename Kernel_base::Aff_transformation_2 Aff_transformation_2_base;
typedef typename Kernel_base::Point_3 Point_3_base;
typedef typename Kernel_base::Vector_3 Vector_3_base;
typedef typename Kernel_base::Direction_3 Direction_3_base;
typedef typename Kernel_base::Line_3 Line_3_base;
typedef typename Kernel_base::Plane_3 Plane_3_base;
typedef typename Kernel_base::Ray_3 Ray_3_base;
typedef typename Kernel_base::Segment_3 Segment_3_base;
typedef typename Kernel_base::Triangle_3 Triangle_3_base;
typedef typename Kernel_base::Tetrahedron_3 Tetrahedron_3_base;
typedef typename Kernel_base::Point_3 Point_3_base;
typedef typename Kernel_base::Vector_3 Vector_3_base;
typedef typename Kernel_base::Direction_3 Direction_3_base;
typedef typename Kernel_base::Line_3 Line_3_base;
typedef typename Kernel_base::Plane_3 Plane_3_base;
typedef typename Kernel_base::Ray_3 Ray_3_base;
typedef typename Kernel_base::Segment_3 Segment_3_base;
typedef typename Kernel_base::Triangle_3 Triangle_3_base;
typedef typename Kernel_base::Tetrahedron_3 Tetrahedron_3_base;
typedef typename Kernel_base::Aff_transformation_3 Aff_transformation_3_base;
// Note: necessary to qualify Point_3 by CGAL:: to disambiguate between
// Point_3 in the current namespace (nested within CGAL) and
// CGAL::Point_3< Cartesian_3<FT> > (which is in the CGAL namespace)
typedef CGAL::Point_2<Self> Point_2;
typedef CGAL::Vector_2<Self> Vector_2;
typedef CGAL::Direction_2<Self> Direction_2;
typedef CGAL::Segment_2<Self> Segment_2;
typedef CGAL::Line_2<Self> Line_2;
typedef CGAL::Ray_2<Self> Ray_2;
typedef CGAL::Triangle_2<Self> Triangle_2;
typedef CGAL::Circle_2<Self> Circle_2;
typedef CGAL::Iso_rectangle_2<Self> Iso_rectangle_2;
typedef CGAL::Aff_transformation_2<Self> Aff_transformation_2;
typedef CGAL::Point_2<Self> Point_2;
typedef CGAL::Vector_2<Self> Vector_2;
typedef CGAL::Direction_2<Self> Direction_2;
typedef CGAL::Segment_2<Self> Segment_2;
typedef CGAL::Line_2<Self> Line_2;
typedef CGAL::Ray_2<Self> Ray_2;
typedef CGAL::Triangle_2<Self> Triangle_2;
typedef CGAL::Circle_2<Self> Circle_2;
typedef CGAL::Iso_rectangle_2<Self> Iso_rectangle_2;
typedef CGAL::Aff_transformation_2<Self> Aff_transformation_2;
typedef Data_accessorC2<Self> Data_accessor_2;
typedef ConicCPA2<Point_2,Data_accessor_2> Conic_2;
typedef Data_accessorC2<Self> Data_accessor_2;
typedef ConicCPA2<Point_2,Data_accessor_2> Conic_2;
typedef CGAL::Point_3<Self> Point_3;
typedef CGAL::Vector_3<Self> Vector_3;
typedef CGAL::Direction_3<Self> Direction_3;
typedef CGAL::Line_3<Self> Line_3;
typedef CGAL::Plane_3<Self> Plane_3;
typedef CGAL::Ray_3<Self> Ray_3;
typedef CGAL::Segment_3<Self> Segment_3;
typedef CGAL::Triangle_3<Self> Triangle_3;
typedef CGAL::Tetrahedron_3<Self> Tetrahedron_3;
typedef CGAL::Aff_transformation_3<Self> Aff_transformation_3;
typedef CGAL::Point_3<Self> Point_3;
typedef CGAL::Vector_3<Self> Vector_3;
typedef CGAL::Direction_3<Self> Direction_3;
typedef CGAL::Line_3<Self> Line_3;
typedef CGAL::Plane_3<Self> Plane_3;
typedef CGAL::Ray_3<Self> Ray_3;
typedef CGAL::Segment_3<Self> Segment_3;
typedef CGAL::Triangle_3<Self> Triangle_3;
typedef CGAL::Tetrahedron_3<Self> Tetrahedron_3;
typedef CGAL::Aff_transformation_3<Self> Aff_transformation_3;
#endif // CGAL_CFG_NO_ADVANCED_KERNEL
@ -251,16 +233,16 @@ struct Cartesian_3 :
static RT FT_numerator(const FT &r) { return r;}
static RT FT_denominator(const FT &) { return RT(1);}
typedef CGALi::Construct<Point_3> Construct_point_3;
typedef CGALi::Construct<Vector_3> Construct_vector_3;
typedef CGALi::Construct<Direction_3> Construct_direction_3;
typedef CGALi::Construct<Segment_3> Construct_segment_3;
typedef CGALi::Construct<Plane_3> Construct_plane_3;
typedef CGALi::Construct<Line_3> Construct_line_3;
typedef CGALi::Construct<Ray_3> Construct_ray_3;
typedef CGALi::Construct<Triangle_3> Construct_triangle_3;
typedef CGALi::Construct<Tetrahedron_3> Construct_tetrahedron_3;
typedef CGALi::Construct<Aff_transformation_3> Construct_aff_transformation_3;
typedef CGALi::Construct<Point_3> Construct_point_3;
typedef CGALi::Construct<Vector_3> Construct_vector_3;
typedef CGALi::Construct<Direction_3> Construct_direction_3;
typedef CGALi::Construct<Segment_3> Construct_segment_3;
typedef CGALi::Construct<Plane_3> Construct_plane_3;
typedef CGALi::Construct<Line_3> Construct_line_3;
typedef CGALi::Construct<Ray_3> Construct_ray_3;
typedef CGALi::Construct<Triangle_3> Construct_triangle_3;
typedef CGALi::Construct<Tetrahedron_3> Construct_tetrahedron_3;
typedef CGALi::Construct<Aff_transformation_3> Construct_aff_transformation_3;
Construct_point_3
construct_point_3_object() const
@ -302,12 +284,12 @@ Construct_aff_transformation_3
construct_aff_transformation_3_object() const
{ return Construct_aff_transformation_3(); }
typedef CGALi::Call_point_to_get<Point_3> Construct_point_on_3;
typedef CGALi::Call_point_to_get<Point_3> Construct_point_on_3;
Construct_point_on_3
construct_point_on_3_object() const
{ return Construct_point_on_3(); }
typedef CGALi::Call_second_point_to_get<Point_3> Construct_second_point_on_3;
typedef CGALi::Call_second_point_to_get<Point_3> Construct_second_point_on_3;
Construct_second_point_on_3
construct_second_point_on_3_object() const
{ return Construct_second_point_on_3(); }
@ -317,197 +299,197 @@ Construct_perpendicular_plane_3
construct_perpendicular_plane_3() const
{ return Construct_perpendicular_plane_3(); }
typedef CGALi::p_Midpoint<Point_3> Construct_midpoint_3;
typedef CGALi::p_Midpoint<Point_3> Construct_midpoint_3;
Construct_midpoint_3
construct_midpoint_3_object() const
{ return Construct_midpoint_3(); }
typedef CGALi::Call_opposite_to_get<Segment_3> Construct_opposite_segment_3;
typedef CGALi::Call_opposite_to_get<Segment_3> Construct_opposite_segment_3;
Construct_opposite_segment_3
construct_opposite_segment_3_object() const
{ return Construct_opposite_segment_3(); }
typedef CGALi::Call_opposite_to_get<Ray_3> Construct_opposite_ray_3;
typedef CGALi::Call_opposite_to_get<Ray_3> Construct_opposite_ray_3;
Construct_opposite_ray_3
construct_opposite_ray_3_object() const
{ return Construct_opposite_ray_3(); }
typedef CGALi::Call_opposite_to_get<Line_3> Construct_opposite_line_3;
typedef CGALi::Call_opposite_to_get<Line_3> Construct_opposite_line_3;
Construct_opposite_line_3
construct_opposite_line_3_object() const
{ return Construct_opposite_line_3(); }
typedef CGALi::Call_supporting_plane_to_get<Plane_3> Construct_supporting_plane_3;
typedef CGALi::Call_supporting_plane_to_get<Plane_3> Construct_supporting_plane_3;
Construct_supporting_plane_3
construct_supporting_plane_3_object() const
{ return Construct_supporting_plane_3(); }
typedef CGALi::Call_transform Transform_3;
typedef CGALi::Call_transform Transform_3;
Transform_3
transform_3_object() const
{ return Transform_2(); }
typedef CGALi::Intersect Intersect_3;
typedef CGALi::Intersect Intersect_3;
Intersect_3
intersect_3_object() const
{ return Intersect_3(); }
typedef CGALi::Call_squared_length_to_get<FT> Compute_squared_length_3;
typedef CGALi::Call_squared_length_to_get<FT> Compute_squared_length_3;
Compute_squared_length_3
compute_squared_length_3_object() const
{ return Compute_squared_length_3(); }
typedef CGALi::Equal Equal_3;
typedef CGALi::Equal Equal_3;
Equal_3
equal_3_object() const
{ return Equal_3(); }
typedef CGALi::Equal_x Equal_x_3;
typedef CGALi::Equal_x Equal_x_3;
Equal_x_3
equal_x_3_object() const
{ return Equal_x_3(); }
typedef CGALi::Equal_y Equal_y_3;
typedef CGALi::Equal_y Equal_y_3;
Equal_y_3
equal_y_3_object() const
{ return Equal_y_3(); }
typedef CGALi::Equal_z Equal_z_3;
typedef CGALi::Equal_z Equal_z_3;
Equal_z_3
equal_z_3_object() const
{ return Equal_z_3(); }
typedef CGALi::Equal_xy Equal_xy_3;
typedef CGALi::Equal_xy Equal_xy_3;
Equal_xy_3
equal_xy_3_object() const
{ return Equal_xy_3(); }
typedef CGALi::Equal_xyz Equal_xyz_3;
typedef CGALi::Equal_xyz Equal_xyz_3;
Equal_xyz_3
equal_xyz_3_object() const
{ return Equal_xyz_3(); }
typedef CGALi::Less_x Less_x_3;
typedef CGALi::Less_x Less_x_3;
Less_x_3
less_x_3_object() const
{ return Less_x_3(); }
typedef CGALi::Less_y Less_y_3;
typedef CGALi::Less_y Less_y_3;
Less_y_3
less_y_3_object() const
{ return Less_y_3(); }
typedef CGALi::Less_z Less_z_3;
typedef CGALi::Less_z Less_z_3;
Less_z_3
less_z_3_object() const
{ return Less_z_3(); }
typedef CGAL::p_Less_xy<Point_3> Less_xy_3;
typedef CGAL::p_Less_xy<Point_3> Less_xy_3;
Less_xy_3
less_xy_3_object() const
{ return Less_xy_3(); }
typedef CGALi::Less_xyz Less_xyz_3;
typedef CGALi::Less_xyz Less_xyz_3;
Less_xyz_3
less_xyz_3_object() const
{ return Less_xyz_3(); }
typedef CGALi::Compare_x Compare_x_3;
typedef CGALi::Compare_x Compare_x_3;
Compare_x_3
compare_x_3_object() const
{ return Compare_x_3(); }
typedef CGALi::Compare_y Compare_y_3;
typedef CGALi::Compare_y Compare_y_3;
Compare_y_3
compare_y_3_object() const
{ return Compare_y_3(); }
typedef CGALi::Compare_z Compare_z_3;
typedef CGALi::Compare_z Compare_z_3;
Compare_z_3
compare_z_3_object() const
{ return Compare_z_3(); }
typedef CGALi::Compare_xy Compare_xy_3;
typedef CGALi::Compare_xy Compare_xy_3;
Compare_xy_3
compare_xy_3_object() const
{ return Compare_xyz_3(); }
typedef CGALi::Compare_xyz Compare_xyz_3;
typedef CGALi::Compare_xyz Compare_xyz_3;
Compare_xyz_3
compare_xyz_3_object() const
{ return Compare_xyz_3(); }
typedef CGAL ::p_Less_dist_to_point<Point_3> Less_distance_to_point_3;
typedef CGAL ::p_Less_dist_to_point<Point_3> Less_distance_to_point_3;
Less_distance_to_point_3
less_distance_to_point_3_object() const
{ return Less_distance_to_point_3(); }
typedef CGALi::Collinear Collinear_3;
typedef CGALi::Collinear Collinear_3;
Collinear_3
collinear_3_object() const
{ return Collinear_3(); }
typedef CGALi::Coplanar Coplanar_3 ;
typedef CGALi::Coplanar Coplanar_3 ;
Coplanar_3
coplanar_3_object() const
{ return Coplanar_3(); }
typedef CGAL ::p_Orientation<Point_3> Orientation_3;
typedef CGAL ::p_Orientation<Point_3> Orientation_3;
Orientation_3
orientation_3_object() const
{ return Orientation_3(); }
typedef CGALi::Call_is_degenerate Is_degenerate_3;
typedef CGALi::Call_is_degenerate Is_degenerate_3;
Is_degenerate_3
is_degenerate_3_object() const
{ return Is_degenerate_3(); }
typedef CGALi::Call_has_on Has_on_3;
typedef CGALi::Call_has_on Has_on_3;
Has_on_3
has_on_3_object() const
{ return Has_on_3(); }
typedef CGALi::Call_has_on_bounded_side Has_on_bounded_side_3;
typedef CGALi::Call_has_on_bounded_side Has_on_bounded_side_3;
Has_on_bounded_side_3
has_on_bounded_side_3_object() const
{ return Has_on_bounded_side_3(); }
typedef CGALi::Call_has_on_unbounded_side Has_on_unbounded_side_3;
typedef CGALi::Call_has_on_unbounded_side Has_on_unbounded_side_3;
Has_on_unbounded_side_3
has_on_unbounded_side_3_object() const
{ return Has_on_unbounded_side_3(); }
typedef CGALi::Call_has_on_boundary Has_on_boundary_3;
typedef CGALi::Call_has_on_boundary Has_on_boundary_3;
Has_on_boundary_3
has_on_boundary_3_object() const
{ return Has_on_boundary_3(); }
typedef CGALi::Call_has_on_positive_side Has_on_positive_side_3;
typedef CGALi::Call_has_on_positive_side Has_on_positive_side_3;
Has_on_positive_side_3
has_on_positive_side_3_object() const
{ return Has_on_positive_side_3(); }
typedef CGALi::Call_has_on_negative_side Has_on_negative_side_3;
typedef CGALi::Call_has_on_negative_side Has_on_negative_side_3;
Has_on_negative_side_3
has_on_negative_side_3_object() const
{ return Has_on_negative_side_3(); }
typedef CGALi::Call_oriented_side Oriented_side_3;
typedef CGALi::Call_oriented_side Oriented_side_3;
Oriented_side_3
oriented_side_3_object() const
{ return Oriented_side_3(); }
typedef CGALi::Are_ordered_along_line Are_ordered_along_line_3 ;
typedef CGALi::Are_ordered_along_line Are_ordered_along_line_3;
Are_ordered_along_line_3
are_ordered_along_line_3_object() const
{ return Are_ordered_along_line_3(); }
typedef CGALi::Are_strictly_ordered_along_line Are_strictly_ordered_along_line_3;
typedef CGALi::Are_strictly_ordered_along_line Are_strictly_ordered_along_line_3;
Are_strictly_ordered_along_line_3
are_strictly_ordered_along_line_3_object() const
{ return Are_strictly_ordered_along_line_3(); }
typedef CGALi::Collinear_are_ordered_along_line Collinear_are_ordered_along_line_3;
typedef CGALi::Collinear_are_ordered_along_line Collinear_are_ordered_along_line_3;
Collinear_are_ordered_along_line_3
collinear_are_ordered_along_line_3_object() const
{ return Collinear_are_ordered_along_line_3(); }
@ -517,12 +499,12 @@ Collinear_are_strictly_ordered_along_line_3
collinear_are_strictly_ordered_along_line_3_object() const
{ return Collinear_are_strictly_ordered_along_line_3(); }
typedef CGALi::Side_of_oriented_sphere Side_of_oriented_sphere_3;
typedef CGALi::Side_of_oriented_sphere Side_of_oriented_sphere_3;
Side_of_oriented_sphere_3
side_of_oriented_sphere_3_object() const
{ return Side_of_oriented_sphere_3(); }
typedef CGALi::Side_of_bounded_sphere Side_of_bounded_sphere_3;
typedef CGALi::Side_of_bounded_sphere Side_of_bounded_sphere_3;
Side_of_bounded_sphere_3
side_of_bounded_sphere_3_object() const
{ return Side_of_bounded_sphere_3(); }

View File

@ -1,24 +1,6 @@
// ============================================================================
//
// Copyright (c) 1999 The CGAL Consortium
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// ----------------------------------------------------------------------------
//
// release :
// release_date :
//
// file : include/CGAL/Cartesian_dynamic_d.h
// revision : $Revision$
// revision_date : $Date$
// author(s) : Herve Bronnimann
//
// coordinator : INRIA Sophia-Antipolis
//
// ============================================================================
#ifndef CGAL_CARTESIAN_DYNAMIC_D_H
#define CGAL_CARTESIAN_DYNAMIC_D_H

View File

@ -1,24 +1,6 @@
// ============================================================================
//
// Copyright (c) 1999 The CGAL Consortium
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// ----------------------------------------------------------------------------
//
// release :
// release_date :
//
// file : include/CGAL/Kernel/Construction_objects.h
// revision : $Revision$
// revision_date : $Date$
// author(s) : Herve Bronnimann
//
// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann@sophia.inria.fr)
//
// ============================================================================
#ifndef CGAL_KERNEL_CONSTRUCTION_OBJECTS_H
#define CGAL_KERNEL_CONSTRUCTION_OBJECTS_H

View File

@ -1,24 +1,6 @@
// ============================================================================
//
// Copyright (c) 1999 The CGAL Consortium
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// ----------------------------------------------------------------------------
//
// release :
// release_date :
//
// file : include/CGAL/Kernel/Construction_objects_2.h
// revision : $Revision$
// revision_date : $Date$
// author(s) : Herve Bronnimann
//
// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann@sophia.inria.fr)
//
// ============================================================================
#ifndef CGAL_KERNEL_CONSTRUCTION_OBJECTS_2_H
#define CGAL_KERNEL_CONSTRUCTION_OBJECTS_2_H

View File

@ -1,24 +1,6 @@
// ============================================================================
//
// Copyright (c) 1999 The CGAL Consortium
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// ----------------------------------------------------------------------------
//
// release :
// release_date :
//
// file : include/CGAL/Kernel/Construction_objects_3.h
// revision : $Revision$
// revision_date : $Date$
// author(s) : Herve Bronnimann
//
// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann@sophia.inria.fr)
//
// ============================================================================
#ifndef CGAL_KERNEL_CONSTRUCTION_OBJECTS_3_H
#define CGAL_KERNEL_CONSTRUCTION_OBJECTS_3_H
@ -44,7 +26,112 @@ typedef typename R::Triangle_3 Triangle_3;
typedef typename R::Tetrahedron_3 Tetrahedron_3;
typedef typename R::Aff_transformation_3 Aff_transformation_3;
/* PLEASE FILL IN WITH STEFAN */
typedef CGALi::Construct<Point_3> Construct_point_3;
typedef CGALi::Construct<Vector_3> Construct_vector_3;
typedef CGALi::Construct<Direction_3> Construct_direction_3;
typedef CGALi::Construct<Segment_3> Construct_segment_3;
typedef CGALi::Construct<Plane_3> Construct_plane_3;
typedef CGALi::Construct<Line_3> Construct_line_3;
typedef CGALi::Construct<Ray_3> Construct_ray_3;
typedef CGALi::Construct<Triangle_3> Construct_triangle_3;
typedef CGALi::Construct<Tetrahedron_3> Construct_tetrahedron_3;
typedef CGALi::Construct<Aff_transformation_3> Construct_aff_transformation_3;
Construct_point_3
construct_point_3_object() const
{ return Construct_point_3(); }
Construct_vector_3
construct_vector_3_object() const
{ return Construct_vector_3(); }
Construct_direction_3
construct_direction_3_object() const
{ return Construct_direction_3(); }
Construct_segment_3
construct_segment_3_object() const
{ return Construct_segment_3(); }
Construct_plane_3
construct_plane_3_object() const
{ return Construct_plane_3(); }
Construct_line_3
construct_line_3_object() const
{ return Construct_line_3(); }
Construct_ray_3
construct_ray_3_object() const
{ return Construct_ray_3(); }
Construct_triangle_3
construct_triangle_3_object() const
{ return Construct_triangle_3(); }
Construct_tetrahedron_3
construct_tetrahedron_object() const
{ return Construct_tetrahedron_3(); }
Construct_aff_transformation_3
construct_aff_transformation_3_object() const
{ return Construct_aff_transformation_3(); }
typedef CGALi::Call_point_to_get<Point_3> Construct_point_on_3;
Construct_point_on_3
construct_point_on_3_object() const
{ return Construct_point_on_3(); }
typedef CGALi::Call_second_point_to_get<Point_3> Construct_second_point_on_3;
Construct_second_point_on_3
construct_second_point_on_3_object() const
{ return Construct_second_point_on_3(); }
typedef CGALi::Call_perpendicular_plane_to_get<Plane_3> Construct_perpendicular_plane_3;
Construct_perpendicular_plane_3
construct_perpendicular_plane_3() const
{ return Construct_perpendicular_plane_3(); }
typedef CGALi::p_Midpoint<Point_3> Construct_midpoint_3;
Construct_midpoint_3
construct_midpoint_3_object() const
{ return Construct_midpoint_3(); }
typedef CGALi::Call_opposite_to_get<Segment_3> Construct_opposite_segment_3;
Construct_opposite_segment_3
construct_opposite_segment_3_object() const
{ return Construct_opposite_segment_3(); }
typedef CGALi::Call_opposite_to_get<Ray_3> Construct_opposite_ray_3;
Construct_opposite_ray_3
construct_opposite_ray_3_object() const
{ return Construct_opposite_ray_3(); }
typedef CGALi::Call_opposite_to_get<Line_3> Construct_opposite_line_3;
Construct_opposite_line_3
construct_opposite_line_3_object() const
{ return Construct_opposite_line_3(); }
typedef CGALi::Call_supporting_plane_to_get<Plane_3> Construct_supporting_plane_3;
Construct_supporting_plane_3
construct_supporting_plane_3_object() const
{ return Construct_supporting_plane_3(); }
typedef CGALi::Call_transform Transform_3;
Transform_3
transform_3_object() const
{ return Transform_2(); }
typedef CGALi::Intersect Intersect_3;
Intersect_3
intersect_3_object() const
{ return Intersect_3(); }
typedef CGALi::Call_squared_length_to_get<FT> Compute_squared_length_3;
Compute_squared_length_3
compute_squared_length_3_object() const
{ return Compute_squared_length_3(); }
};
CGAL_END_NAMESPACE

View File

@ -1,24 +1,6 @@
// ============================================================================
//
// Copyright (c) 1999 The CGAL Consortium
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// ----------------------------------------------------------------------------
//
// release :
// release_date :
//
// file : include/CGAL/Kernel/Predicate_objects.h
// revision : $Revision$
// revision_date : $Date$
// author(s) : Herve Bronnimann
//
// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann@sophia.inria.fr)
//
// ============================================================================
#ifndef CGAL_KERNEL_PREDICATE_OBJECTS_H
#define CGAL_KERNEL_PREDICATE_OBJECTS_H

View File

@ -1,24 +1,6 @@
// ============================================================================
//
// Copyright (c) 1999 The CGAL Consortium
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// ----------------------------------------------------------------------------
//
// release :
// release_date :
//
// file : include/CGAL/Kernel/Predicate_objects_2.h
// revision : $Revision$
// revision_date : $Date$
// author(s) : Herve Bronnimann
//
// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann@sophia.inria.fr)
//
// ============================================================================
#ifndef CGAL_KERNEL_PREDICATE_OBJECTS_2_H
#define CGAL_KERNEL_PREDICATE_OBJECTS_2_H

View File

@ -1,24 +1,6 @@
// ============================================================================
//
// Copyright (c) 1999 The CGAL Consortium
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// ----------------------------------------------------------------------------
//
// release :
// release_date :
//
// file : include/CGAL/Kernel/Predicate_objects_3.h
// revision : $Revision$
// revision_date : $Date$
// author(s) : Herve Bronnimann
//
// coordinator : INRIA Sophia-Antipolis (Herve.Bronnimann@sophia.inria.fr)
//
// ============================================================================
#ifndef CGAL_KERNEL_PREDICATE_OBJECTS_3_H
#define CGAL_KERNEL_PREDICATE_OBJECTS_3_H
@ -44,7 +26,176 @@ typedef typename R::Triangle_3 Triangle_3;
typedef typename R::Tetrahedron_3 Tetrahedron_3;
typedef typename R::Aff_transformation_3 Aff_transformation_3;
/* PLEASE FILL IN WITH STEFAN */
typedef CGALi::Equal Equal_3;
Equal_3
equal_3_object() const
{ return Equal_3(); }
typedef CGALi::Equal_x Equal_x_3;
Equal_x_3
equal_x_3_object() const
{ return Equal_x_3(); }
typedef CGALi::Equal_y Equal_y_3;
Equal_y_3
equal_y_3_object() const
{ return Equal_y_3(); }
typedef CGALi::Equal_z Equal_z_3;
Equal_z_3
equal_z_3_object() const
{ return Equal_z_3(); }
typedef CGALi::Equal_xy Equal_xy_3;
Equal_xy_3
equal_xy_3_object() const
{ return Equal_xy_3(); }
typedef CGALi::Equal_xyz Equal_xyz_3;
Equal_xyz_3
equal_xyz_3_object() const
{ return Equal_xyz_3(); }
typedef CGALi::Less_x Less_x_3;
Less_x_3
less_x_3_object() const
{ return Less_x_3(); }
typedef CGALi::Less_y Less_y_3;
Less_y_3
less_y_3_object() const
{ return Less_y_3(); }
typedef CGALi::Less_z Less_z_3;
Less_z_3
less_z_3_object() const
{ return Less_z_3(); }
typedef CGAL::p_Less_xy<Point_3> Less_xy_3;
Less_xy_3
less_xy_3_object() const
{ return Less_xy_3(); }
typedef CGALi::Less_xyz Less_xyz_3;
Less_xyz_3
less_xyz_3_object() const
{ return Less_xyz_3(); }
typedef CGALi::Compare_x Compare_x_3;
Compare_x_3
compare_x_3_object() const
{ return Compare_x_3(); }
typedef CGALi::Compare_y Compare_y_3;
Compare_y_3
compare_y_3_object() const
{ return Compare_y_3(); }
typedef CGALi::Compare_z Compare_z_3;
Compare_z_3
compare_z_3_object() const
{ return Compare_z_3(); }
typedef CGALi::Compare_xy Compare_xy_3;
Compare_xy_3
compare_xy_3_object() const
{ return Compare_xyz_3(); }
typedef CGALi::Compare_xyz Compare_xyz_3;
Compare_xyz_3
compare_xyz_3_object() const
{ return Compare_xyz_3(); }
typedef CGAL ::p_Less_dist_to_point<Point_3> Less_distance_to_point_3;
Less_distance_to_point_3
less_distance_to_point_3_object() const
{ return Less_distance_to_point_3(); }
typedef CGALi::Collinear Collinear_3;
Collinear_3
collinear_3_object() const
{ return Collinear_3(); }
typedef CGALi::Coplanar Coplanar_3 ;
Coplanar_3
coplanar_3_object() const
{ return Coplanar_3(); }
typedef CGAL ::p_Orientation<Point_3> Orientation_3;
Orientation_3
orientation_3_object() const
{ return Orientation_3(); }
typedef CGALi::Call_is_degenerate Is_degenerate_3;
Is_degenerate_3
is_degenerate_3_object() const
{ return Is_degenerate_3(); }
typedef CGALi::Call_has_on Has_on_3;
Has_on_3
has_on_3_object() const
{ return Has_on_3(); }
typedef CGALi::Call_has_on_bounded_side Has_on_bounded_side_3;
Has_on_bounded_side_3
has_on_bounded_side_3_object() const
{ return Has_on_bounded_side_3(); }
typedef CGALi::Call_has_on_unbounded_side Has_on_unbounded_side_3;
Has_on_unbounded_side_3
has_on_unbounded_side_3_object() const
{ return Has_on_unbounded_side_3(); }
typedef CGALi::Call_has_on_boundary Has_on_boundary_3;
Has_on_boundary_3
has_on_boundary_3_object() const
{ return Has_on_boundary_3(); }
typedef CGALi::Call_has_on_positive_side Has_on_positive_side_3;
Has_on_positive_side_3
has_on_positive_side_3_object() const
{ return Has_on_positive_side_3(); }
typedef CGALi::Call_has_on_negative_side Has_on_negative_side_3;
Has_on_negative_side_3
has_on_negative_side_3_object() const
{ return Has_on_negative_side_3(); }
typedef CGALi::Call_oriented_side Oriented_side_3;
Oriented_side_3
oriented_side_3_object() const
{ return Oriented_side_3(); }
typedef CGALi::Are_ordered_along_line Are_ordered_along_line_3 ;
Are_ordered_along_line_3
are_ordered_along_line_3_object() const
{ return Are_ordered_along_line_3(); }
typedef CGALi::Are_strictly_ordered_along_line Are_strictly_ordered_along_line_3;
Are_strictly_ordered_along_line_3
are_strictly_ordered_along_line_3_object() const
{ return Are_strictly_ordered_along_line_3(); }
typedef CGALi::Collinear_are_ordered_along_line Collinear_are_ordered_along_line_3;
Collinear_are_ordered_along_line_3
collinear_are_ordered_along_line_3_object() const
{ return Collinear_are_ordered_along_line_3(); }
typedef CGALi::Collinear_are_strictly_ordered_along_line Collinear_are_strictly_ordered_along_line_3;
Collinear_are_strictly_ordered_along_line_3
collinear_are_strictly_ordered_along_line_3_object() const
{ return Collinear_are_strictly_ordered_along_line_3(); }
typedef CGALi::Side_of_oriented_sphere Side_of_oriented_sphere_3;
Side_of_oriented_sphere_3
side_of_oriented_sphere_3_object() const
{ return Side_of_oriented_sphere_3(); }
typedef CGALi::Side_of_bounded_sphere Side_of_bounded_sphere_3;
Side_of_bounded_sphere_3
side_of_bounded_sphere_3_object() const
{ return Side_of_bounded_sphere_3(); }
};
CGAL_END_NAMESPACE

View File

@ -1,24 +1,6 @@
// ============================================================================
//
// Copyright (c) 1998, 1999 The CGAL Consortium
//
// This software and related documentation is part of an INTERNAL release
// of the Computational Geometry Algorithms Library (CGAL). It is not
// intended for general use.
//
// ----------------------------------------------------------------------------
//
// release :
// release_date :
//
// file : include/CGAL/cartesian_classes.h
// revision : $Revision$
// revision_date : $Date$
// authors : Herve Bronnimann
//
// coordinator : INRIA Sophia-Antipolis
//
// ============================================================================
#ifndef CGAL_CARTESIAN_CLASSES_H
#define CGAL_CARTESIAN_CLASSES_H

View File

@ -1 +1 @@
3.3.6 ( 8 Oct 1999 )
3.3.7 ( 22 Nov 1999 )