.

Packages/Arrangement/test/Arrangement_2/DATA/polylines/big_overlap

@@ -1,13 +1,32 @@
-#First map
-1
-
+# Arr_polyline_traits Test Data File
+# Big Overlap
+#
+# No. of polylines:
+2
+# Polylines:
+# ----------
+# No. of points:
 5
+# Points:
 0 0  20 0  30 20  40 0  60 0
-
-#Second map
-1
-
+# No. of points:
 6
+# Points:
 10 10  25 10  30 20  40 0  50 0  50 -10
-
-
+#
+# No. of test points:
+1
+# Test points
+# -------------
+# (coordinates followed by expected type:
+# 1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+ 1  1  6
+#
+# No. of expected vertices :
+8
+# No. of expected halfedges:
+7
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+3

Packages/Arrangement/test/Arrangement_2/DATA/polylines/closed_polyline

@@ -1,13 +1,27 @@
-#First map
+# Arr_polyline_traits Test Data File
+# Closed Polyline (Polygon)
+#
+# No. of polylines:
 1 
-
+# Polylines:
+# No. of points:
 5
+# Points:
 0 5  5 10  10 5  5 0  0 5
-
-
-#Second map
-1
-
+# No. of test points:
+5
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+5 10   2
+5  0   2
+1  6   2
+5  5   3
+0  0   6
+# No. of expected vertices :
 2
-0 0  0 5
-
+# No. of expected edges:
+2
+# No. of expected faces    :
+2
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/polylines/collinears

@@ -1,15 +1,45 @@
-#First map
-2
-
+# Arr_polyline_traits Test Data File
+# Collinear polylines
+#
+# No. of polylines:
 3
+# Polylines:
+# ----------
+# i) Two overlapping collinear polylines
+# No. of points:
+3
+# Points:
 0 0  20 0  40 0
-
+# No. of points:
 3
+# Points:
 10 0  30 0  50 0
-
-#Second map
-1
-
+# ii) A vertical collinear polyline
+# No. of points:
 3
+# Points:
 0 10  0 20  0 30
-
+#
+# No. of test points:
+8
+# Test points:
+# ------------
+# (coordinates followed by expected type:
+# 1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+0  1 6
+0 11 2
+0 21 2
+1  0 2
+11 0 2
+21 0 2
+31 0 2
+42 0 2
+#
+# No. of expected vertices :
+9
+# No. of expected edges:
+7
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+3

Packages/Arrangement/test/Arrangement_2/DATA/polylines/edge_vertex_intersection

@@ -1,13 +1,31 @@
-#First map
-1
-
+# Arr_polyline_traits Test Data File
+# Edge Vertex Intersection
+#
+# No. of polylines:
+2 
+# Polylines:
+# No. of points:
 2
+# Points:
 10 0   10 20
-
-
-#Second map
-1
-
+# No. of points:
 3
+# Points:
 20 0  10 10  20 20
-
+# No. of test points:
+5
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+10 10  1
+10 11  2
+10  9  2
+11  9  2
+0   0  6
+# No. of expected vertices :
+5
+# No. of expected edges:
+4
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/polylines/endpoint_intersection

@@ -1,13 +1,28 @@
-#First map
-1
-
+# Arr_polyline_traits Test Data File
+# Endpoint Intersection
+#
+# No. of polylines:
+2 
+# Polylines:
+# No. of points:
 2
+# Points:
 0 0   10 10
-
-
-#Second map
-1
-
+# No. of points:
 2
+# Points:
 20 0  10 10
-
+# No. of test points:
+2
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+9 9    2
+11 11  6
+# No. of expected vertices :
+3
+# No. of expected edges:
+2
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/polylines/partial_overlap

@@ -1,12 +1,29 @@
-#First map
-1
-
+# Arr_polyline_traits Test Data File
+# Partial Overlap
+#
+# No. of polylines:
+2 
+# Polylines:
+# No. of points:
 4
+# Points:
 0 20  5 10  15 10  25 0
-
-
-#Second map
-1
-
+# No. of points:
 4
+# Points:
 0 0  10 10  20 10  25 20
+# No. of test points:
+3
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+12 10  2
+ 9 10  2
+0   5  6
+# No. of expected vertices :
+6
+# No. of expected edges:
+5
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+1

Packages/Arrangement/test/Arrangement_2/DATA/polylines/partial_overlap2

@@ -1,14 +1,26 @@
-#First map
-1 
-
+# Arr_polyline_traits Test Data File
+# Partial Overlap
+#
+# No. of polylines:
+2 
+# Polylines:
+# No. of points:
 2
+# Points:
 1 0  2 0
-
-
-#Second map
-1
-
+# No. of points:
 2
+# Points:
 0 0  2 0
-
-
+# No. of test points:
+0
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+# No. of expected vertices :
+3
+# No. of expected edges:
+2
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+1

Packages/Arrangement/test/Arrangement_2/DATA/polylines/self_cut

@@ -1,13 +1,27 @@
-#First map
+# Arr_polyline_traits Test Data File
+# Self Cutting Polyline 
+#
+# No. of polylines:
 1 
-
+# Polylines:
+# No. of points:
 4
+# Points:
 0 1  1 0  0 0  1 1
-
-
-#Second map
-1
-
-2 
-1 0 
-1 1
+# No. of test points:
+5
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+1/2 0   2
+1/2 1/2   1
+1/4 1/4   2
+1/2 1/4   3
+0 1/2   6
+# No. of expected vertices :
+5
+# No. of expected edges:
+5
+# No. of expected faces    :
+2
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/polylines/simple_intersection

@@ -1,13 +1,29 @@
-# First map
-1
-
+# Arr_polyline_traits Test Data File
+# Simple intersection
+#
+# No. of polylines:
+2 
+# Polylines:
+# No. of points:
 2
+# Points:
 0 0   1 1
-
-#Second map
-1
-
+# No. of points:
 2
+# points:
 0 1   1 0
-
-
+# No. of test points:
+3
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+1/2 1/2    1
+3/4 3/4    2
+0 5/2    6
+# No. of expected vertices :
+5
+# No. of expected edges:
+4
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/polylines/total_overlap

@@ -1,14 +1,29 @@
-#First map
-1 
-
+# Arr_polyline_traits Test Data File
+# Total Overlap
+#
+# No. of polylines:
+2 
+# Polylines:
+# No. of points:
 4
+# Points:
 0 20  5 10  15 10  25 0
-
-
-#Second map
+# No. of points:
+4
+# Points:
+0 20  5 10  15 10  25 0
+# No. of test points:
+3
+# Test vertices (coordinates followed by expected type):
+#               (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+12 10  2
+ 9 10  2
+0   5  6
+# No. of expected points :
+4
+# No. of expected edges:
+3
+# No. of expected faces    :
 1
-
-4
-0 20  5 10  15 10  25 0
-
-
+# No. of expected overlaps :
+3

Packages/Arrangement/test/Arrangement_2/DATA/polylines/triangle

@@ -1,12 +1,23 @@
-# First map
+# Arr_polyline_traits Test Data File
+# Closed Polyline (Polygon)
+#
+# No. of polylines:
 1 
-
+# Polylines:
+# No. of points:
 4
+# Points:
 0 0  10 10  20 0  0 0
-
-#Second map
+# No. of test points:
 1
-
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+-1 -1  6
+# No. of expected vertices :
 2
-0 0 30 10
-
+# No. of expected edges:
+2
+# No. of expected faces    :
+2
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/polylines/two_segments

@@ -1,12 +1,30 @@
-#First map
-1
-
+# Arr_polyline_traits Test Data File
+# Partial Overlap
+#
+# No. of polylines:
+2 
+# Polylines:
+# No. of points:
 2
+# Points:
 0 0  4 4
-
-#Second map
-1
-
+# No. of points:
 2
+# Points:
 2 2  6 6 
-
+# No. of test points:
+4
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+10   10    6
+ 1    1    2
+ 3    3    2
+ 5    5    2
+# No. of expected vertices :
+4
+# No. of expected edges:
+3
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+1

Packages/Arrangement/test/Arrangement_2/DATA/polylines/vertex_intersection

@@ -1,13 +1,29 @@
-#First map
-1 
-
+# Arr_polyline_traits Test Data File
+# Vertex Intersection
+#
+# No. of polylines:
+2 
+# Polylines:
+# No. of points:
 3
+# Points:
 0 0   10 10   0 20
-
-
-#Second map
-1
-
+# No. of points:
 3
+# Points:
 20 0  10 10  20 20
-
+# No. of test points:
+3
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+10 10  1
+11 11  2
+0  10  6
+# No. of expected vertices :
+5
+# No. of expected edges:
+4
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/polylines/vertical_segment

@@ -1,12 +1,25 @@
-#First map
+# Arr_polyline_traits Test Data File
+# Vertical Segment
+#
+# No. of polylines:
 1 
-
+# Polylines:
+# No. of points:
 2
+# Points:
 0 -1  0 1
-
-#Second map
-1
-
+# No. of test points:
+3
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 4 UNBOUNDED_FACE)
+0 0    2
+0 11/10  6
+0 -11/10 6
+# No. of expected points :
 2
--1 0 1 0
-
+# No. of expected edges:
+1
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/segment_circles/edge_vertex_intersection

@@ -1,12 +1,23 @@
-
-#First map
-1 
-
+# Arrangement Test Data File
+# Segment Circle traits
+# Edge Vertex Intersection
+#
+# No. of segments:
+2 
 s 10 0   10 20
-
-#Second map
-1
-
 s 20 10  10 10
-
-
+# No. of test points:
+3
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 6 UNBOUNDED_FACE)
+10 10  1
+11 10  2
+0   0  6
+# No. of expected vertices :
+4
+# No. of expected edges:
+3
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/segment_circles/segs_and_circles

@@ -1,13 +1,27 @@
-#First map
-3
-
+# Arrangement Test Data File
+# Segment Circle traits
+# Segments and Arcs
+#
+# No. of curves
+5
 c 0 0 4
 a 2 0 4  0 0 2 2
 a 1 0 4 -1 0 1 2
-
-#Second map
-2
-
 s -2 2 2 -2
 s  1 2 2 -2  
-
+# No. of test points:
+4
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 6 UNBOUNDED_FACE)
+0 0 1
+-1 1 2
+0 1 3
+0 5 6
+# No. of expected vertices :
+16
+# No. of expected edges:
+23
+# No. of expected faces    :
+9
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/segment_circles/simple_intersection

@@ -1,10 +1,23 @@
-#First map
-1
- 
+# SEGMENT TRAITS TEST DATA - TRIAL VERSION - 4 July 2000 - shai
+# Arr_polyline_traits Test Data File
+# Simple intersection
+#
+# No. of segments:
+2 
 s 0 0   1 1
-
-#Second map
-1
-
 s 0 1   1 0
-
+# No. of test points:
+3
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 6 UNBOUNDED_FACE)
+0.5  0.5    1
+0.75 0.75   2
+0    0.5    6
+# No. of expected vertices :
+5
+# No. of expected edges:
+4
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/segment_circles/triangle

@@ -1,11 +1,22 @@
-#First map
-1
+# Arrangement Test Data File
+# Segment Circle traits
+# Triangle
+#
+# No. of segments
+3 
 s  0  0  10 10
-
-#Second map
-2
-
 s 10 10  20  0
 s 20  0   0  0
-
-
+# No. of test points:
+1
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 6 UNBOUNDED_FACE)
+-1 -1  6
+# No. of expected vertices :
+3
+# No. of expected edges:
+3
+# No. of expected faces    :
+2
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/segment_circles/two_segments

@@ -1,11 +1,24 @@
-#First map
-1
- 
+# Arrangement Test Data File
+# Segment Circle traits
+# Two Segments
+#
+# No. of segments
+2 
 s 0 0  4 4
-
-#Second map
-1
-
 s 2 2  6 6 
-
-
+# No. of test points:
+4
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 6 UNBOUNDED_FACE)
+10   10    6
+ 1    1    2
+ 3    3    2
+ 5    5    2
+# No. of expected vertices :
+4
+# No. of expected edges:
+3
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+1

Packages/Arrangement/test/Arrangement_2/DATA/segment_circles/vertex_intersection

@@ -1,9 +1,23 @@
-#First map
+# Arrangement Test Data File
+# Segment Circle traits
+# Vertex Intersection
+#
+# No. of segments:
 2 
 s 0 0   10 10
 s 20 0  10 10
-
-#Second map
+# No. of test points:
+3
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 6 UNBOUNDED_FACE)
+10 10  1
+11  9  2
+0  10  6
+# No. of expected vertices :
+3
+# No. of expected edges:
+2
+# No. of expected faces    :
 1
-
-c 0 0 1
+# No. of expected overlaps :
+0

Packages/Arrangement/test/Arrangement_2/DATA/segment_circles/vertical_segment

@@ -1,10 +1,22 @@
-
-#First map
+# Arrangement Test Data File
+# Segment Circle traits
+# Vertical Segment
+#
+# No. of segments
 1 
-
 s 0 -1  0 1
-
-#Second map
+# No. of test points:
+3
+# Test points (coordinates followed by expected type):
+#             (1 VERTEX, 2 EDGE, 3 FACE, 6 UNBOUNDED_FACE)
+0 0    2
+0 1.1  6
+0 -1.1 6
+# No. of expected points :
+2
+# No. of expected edges:
 1
-
-c 0 0 1
+# No. of expected faces    :
+1
+# No. of expected overlaps :
+0