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

Updated to CGAL namespace

This commit is contained in:
Geert-Jan Giezeman 1999-02-05 11:45:44 +00:00
parent 691c878691
commit 33327fdd87
17 changed files with 478 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Packages/Distance_3/test/Distance_3/numrep1.h
View File

@ -24,11 +24,11 @@ inline double to_nt(int d)
#include <CGAL/test_types.h>
#include <CGAL/Cartesian.h>
inline CGAL_TestfieldC to_nt(int d)
inline CGAL::TestfieldC to_nt(int d)
{
unsigned char dummy1 = 'a';
signed char dummy2 = 'a';
return CGAL_TestfieldC(dummy1, dummy2, (double)d);
return CGAL::TestfieldC(dummy1, dummy2, (double)d);
}
#endif
@ -39,11 +39,11 @@ inline CGAL_TestfieldC to_nt(int d)
#include <CGAL/test_types.h>
#include <CGAL/Homogeneous.h>
inline CGAL_TestrepH to_nt(int d)
inline CGAL::TestrepH to_nt(int d)
{
unsigned char dummy1 = 'a';
signed char dummy2 = 'a';
return CGAL_TestrepH(dummy1, dummy2, d);
return CGAL::TestrepH(dummy1, dummy2, d);
}
#endif

14
Packages/Distance_3/test/Distance_3/numrep2.h
View File

@ -1,26 +1,26 @@
#if TESTR == 1
typedef double testnt;
typedef CGAL_Cartesian<testnt> TestR;
typedef CGAL::Cartesian<testnt> TestR;
#endif
#if TESTR == 2
typedef double testnt;
typedef CGAL_Homogeneous<testnt> TestR;
typedef CGAL::Homogeneous<testnt> TestR;
#endif
#if TESTR == 3
typedef CGAL_TestfieldC testnt;
typedef CGAL_Cartesian<testnt> TestR;
typedef CGAL::TestfieldC testnt;
typedef CGAL::Cartesian<testnt> TestR;
#endif
#if TESTR == 4
typedef CGAL_TestrepH testnt;
typedef CGAL_Homogeneous<testnt> TestR;
typedef CGAL::TestrepH testnt;
typedef CGAL::Homogeneous<testnt> TestR;
#endif
#if TESTR == 5
#include <LEDA/REDEFINE_NAMES.h>
typedef integer testnt;
#include <LEDA/UNDEFINE_NAMES.h>
typedef CGAL_Homogeneous<testnt> TestR;
typedef CGAL::Homogeneous<testnt> TestR;
#endif

8
Packages/Distance_3/test/Distance_3/tst321.C
View File

@ -6,8 +6,8 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Segment_3< TestR > segment_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Segment_3< TestR > segment_t;
int main()
@ -28,7 +28,7 @@ int main()
point_t tp1(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
point_t tp2(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
segment_t seg(tp1,tp2);
d = CGAL_squared_distance(pt, seg);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(pt, seg);
cout << CGAL::to_double(d) << '\n';
return 0;
}

8
Packages/Distance_3/test/Distance_3/tst322.C
View File

@ -9,8 +9,8 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Segment_3< TestR > segment_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Segment_3< TestR > segment_t;
int main()
@ -34,7 +34,7 @@ int main()
point_t tp3(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
point_t tp4(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
segment_t seg2(tp3,tp4);
d = CGAL_squared_distance(seg1, seg2);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(seg1, seg2);
cout << CGAL::to_double(d) << '\n';
return 0;
}

8
Packages/Distance_3/test/Distance_3/tst323.C
View File

@ -7,8 +7,8 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Ray_3< TestR > ray_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Ray_3< TestR > ray_t;
int main()
@ -29,7 +29,7 @@ int main()
point_t tp1(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
point_t tp2(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
ray_t ray(tp1, tp2);
d = CGAL_squared_distance(pt, ray);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(pt, ray);
cout << CGAL::to_double(d) << '\n';
return 0;
}

8
Packages/Distance_3/test/Distance_3/tst324.C
View File

@ -8,8 +8,8 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Ray_3< TestR > ray_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Ray_3< TestR > ray_t;
int main()
@ -33,8 +33,8 @@ int main()
point_t tp3(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
point_t tp4(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
ray_t ray2(tp3, tp4);
d = CGAL_squared_distance(ray1, ray2);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(ray1, ray2);
cout << CGAL::to_double(d) << '\n';
return 0;
}

10
Packages/Distance_3/test/Distance_3/tst325.C
View File

@ -10,9 +10,9 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Segment_3< TestR > segment_t;
typedef CGAL_Ray_3< TestR > ray_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Segment_3< TestR > segment_t;
typedef CGAL::Ray_3< TestR > ray_t;
int main()
@ -36,7 +36,7 @@ int main()
point_t tp3(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
point_t tp4(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
ray_t ray(tp3, tp4);
d = CGAL_squared_distance(seg, ray);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(seg, ray);
cout << CGAL::to_double(d) << '\n';
return 0;
}

10
Packages/Distance_3/test/Distance_3/tst326.C
View File

@ -8,9 +8,9 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Line_3< TestR > line_t;
typedef CGAL_Ray_3< TestR > ray_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Line_3< TestR > line_t;
typedef CGAL::Ray_3< TestR > ray_t;
int main()
@ -34,7 +34,7 @@ int main()
point_t tp3(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
point_t tp4(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
line_t line(tp3, tp4);
d = CGAL_squared_distance(ray, line);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(ray, line);
cout << CGAL::to_double(d) << '\n';
return 0;
}

8
Packages/Distance_3/test/Distance_3/tst327.C
View File

@ -7,8 +7,8 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Line_3< TestR > line_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Line_3< TestR > line_t;
int main()
@ -29,7 +29,7 @@ int main()
point_t tp1(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
point_t tp2(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
line_t line(tp1, tp2);
d = CGAL_squared_distance(pt, line);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(pt, line);
cout << CGAL::to_double(d) << '\n';
return 0;
}

10
Packages/Distance_3/test/Distance_3/tst328.C
View File

@ -8,9 +8,9 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Line_3< TestR > line_t;
typedef CGAL_Segment_3< TestR > seg_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Line_3< TestR > line_t;
typedef CGAL::Segment_3< TestR > seg_t;
int main()
@ -34,7 +34,7 @@ int main()
point_t tp3(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
point_t tp4(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
line_t line(tp3, tp4);
d = CGAL_squared_distance(seg, line);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(seg, line);
cout << CGAL::to_double(d) << '\n';
return 0;
}

8
Packages/Distance_3/test/Distance_3/tst329.C
View File

@ -7,8 +7,8 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Line_3< TestR > line_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Line_3< TestR > line_t;
int main()
@ -32,7 +32,7 @@ int main()
point_t tp3(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
point_t tp4(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
line_t line2(tp1, tp2);
d = CGAL_squared_distance(line1, line2);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(line1, line2);
cout << CGAL::to_double(d) << '\n';
return 0;
}

8
Packages/Distance_3/test/Distance_3/tst330.C
View File

@ -7,8 +7,8 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Plane_3< TestR > plane_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Plane_3< TestR > plane_t;
int main()
@ -25,7 +25,7 @@ int main()
if (!cin)
return 1;
plane_t plane(to_nt(x), to_nt(y), to_nt(z), to_nt(w));
d = CGAL_squared_distance(pt, plane);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(pt, plane);
cout << CGAL::to_double(d) << '\n';
return 0;
}

10
Packages/Distance_3/test/Distance_3/tst331.C
View File

@ -8,9 +8,9 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Segment_3< TestR > seg_t;
typedef CGAL_Plane_3< TestR > plane_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Segment_3< TestR > seg_t;
typedef CGAL::Plane_3< TestR > plane_t;
int main()
@ -32,7 +32,7 @@ int main()
if (!cin)
return 1;
plane_t plane(to_nt(x), to_nt(y), to_nt(z), to_nt(w));
d = CGAL_squared_distance(seg_t(pt1, pt2), plane);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(seg_t(pt1, pt2), plane);
cout << CGAL::to_double(d) << '\n';
return 0;
}

10
Packages/Distance_3/test/Distance_3/tst332.C
View File

@ -8,9 +8,9 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Ray_3< TestR > ray_t;
typedef CGAL_Plane_3< TestR > plane_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Ray_3< TestR > ray_t;
typedef CGAL::Plane_3< TestR > plane_t;
int main()
@ -32,7 +32,7 @@ int main()
if (!cin)
return 1;
plane_t plane(to_nt(x), to_nt(y), to_nt(z), to_nt(w));
d = CGAL_squared_distance(ray_t(pt1, pt2), plane);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(ray_t(pt1, pt2), plane);
cout << CGAL::to_double(d) << '\n';
return 0;
}

10
Packages/Distance_3/test/Distance_3/tst333.C
View File

@ -7,9 +7,9 @@
#include "numrep2.h"
typedef CGAL_Point_3< TestR > point_t;
typedef CGAL_Line_3< TestR > line_t;
typedef CGAL_Plane_3< TestR > plane_t;
typedef CGAL::Point_3< TestR > point_t;
typedef CGAL::Line_3< TestR > line_t;
typedef CGAL::Plane_3< TestR > plane_t;
int main()
@ -31,7 +31,7 @@ int main()
if (!cin)
return 1;
plane_t plane(to_nt(x), to_nt(y), to_nt(z), to_nt(w));
d = CGAL_squared_distance(line_t(pt1, pt2), plane);
cout << CGAL_to_double(d) << '\n';
d = CGAL::squared_distance(line_t(pt1, pt2), plane);
cout << CGAL::to_double(d) << '\n';
return 0;
}

2
Packages/Distance_3/web/cgal_util.fwi
View File

@ -10,7 +10,7 @@ inline bool CGAL_do_intersect(
}@-
@}
@$@<CGAL_heading@>@(@4@)@Z@M==@{@-
@$@<cgal_heading@>@(@4@)@Z@M==@{@-
@! parameter description with an example value
@! file : include/CGAL/Optimisation/Min_circle_2.h
@! source : web/Optimisation/Min_circle_2.aw

816
Packages/Distance_3/web/sqdistance_3.fw
View File

File diff suppressed because it is too large Load Diff