Merge pull request #7950 from efifogel/Ss_2-test_conics-efif

Surface_sweep_2: enhance the conic tests
CGAL · Jan 8, 2024 · 078b07b · 078b07b
2 parents 3607dc8 + 277c160
commit 078b07b
Show file tree

Hide file tree

Showing 13 changed files with 331 additions and 393 deletions.
diff --git a/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt b/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt
@@ -49,7 +49,7 @@ endfunction()
 
 compile_and_run_sweep(test_sweep test_sweep.cpp ${NAIVE}
                       ${CGAL_SEGMENT_TRAITS} "data/segments_tight")
-compile_and_run_sweep(test_sweep_conic test_sweep_conic.cpp ${NAIVE}
+compile_and_run_sweep(test_sweep_conic test_sweep.cpp ${NAIVE}
                       ${CGAL_CONIC_TRAITS} "data/conics")
 compile_and_run_sweep(test_sweep_polyline test_sweep.cpp ${NAIVE}
                       ${CGAL_POLYLINE_TRAITS} "data/polylines")
diff --git a/Surface_sweep_2/test/Surface_sweep_2/data/conics/con01.txt b/Surface_sweep_2/test/Surface_sweep_2/data/conics/con01.txt
@@ -8,4 +8,3 @@ e 3 3 7 5 4 5 10 5
 {1*x^2 + 1*y^2 + 0*xy + -14*x + -10*y + 65} : (4.66667,6.88562) --cw--> (10,5)
 5
 1
-
diff --git a/Surface_sweep_2/test/Surface_sweep_2/data/conics/con02.txt b/Surface_sweep_2/test/Surface_sweep_2/data/conics/con02.txt
@@ -10,5 +10,3 @@ e 3 3 4 9 7 9 1 9
 {1*x^2 + 1*y^2 + 0*xy + -8*x + -18*y + 88} : (7,9) --cw--> (5.45237,6.375)
 6
 2
-
-
diff --git a/Surface_sweep_2/test/Surface_sweep_2/data/conics/con03.txt b/Surface_sweep_2/test/Surface_sweep_2/data/conics/con03.txt
@@ -12,8 +12,3 @@ f 3 3 4 9
 {1*x^2 + 1*y^2 + 0*xy + -8*x + -18*y + 88} : (1,9) --cw--> (7,9)
 6
 2
-
-
-
-
-
diff --git a/Surface_sweep_2/test/Surface_sweep_2/data/conics/con04.txt b/Surface_sweep_2/test/Surface_sweep_2/data/conics/con04.txt
@@ -12,6 +12,4 @@ f 1 1 3 2
 {1*x^2 + 1*y^2 + 0*xy + -6*x + -4*y + 12} : (4,2) --cw--> (2,2)
 {1*x^2 + 1*y^2 + 0*xy + -6*x + -4*y + 12} : (2,2) --cw--> (4,2)
 6
-0
-
-
+1
diff --git a/Surface_sweep_2/test/Surface_sweep_2/data/conics/con05.txt b/Surface_sweep_2/test/Surface_sweep_2/data/conics/con05.txt
@@ -12,7 +12,3 @@ f 3 3 4 9
 {1*x^2 + 1*y^2 + 0*xy + -8*x + -18*y + 88} : (1,9) --cw--> (7,9)
 6
 2
-
-
-
-
diff --git a/Surface_sweep_2/test/Surface_sweep_2/data/conics/con06.txt b/Surface_sweep_2/test/Surface_sweep_2/data/conics/con06.txt
@@ -14,4 +14,3 @@ f 1 1  1 1
 {1*x^2 + 1*y^2 + 0*xy + -4*x + 0*y + 3} : (2,1) --cw--> (3,0)
 5
 3
-
diff --git a/Surface_sweep_2/test/Surface_sweep_2/data/conics/con07.txt b/Surface_sweep_2/test/Surface_sweep_2/data/conics/con07.txt
@@ -10,4 +10,3 @@ f 2 2 2 2
 {1*x^2 + 1*y^2 + 0*xy + -4*x + -4*y + 4} : (0,2) --cw--> (4,2)
 5
 1
-
diff --git a/Surface_sweep_2/test/Surface_sweep_2/data/conics/con08.txt b/Surface_sweep_2/test/Surface_sweep_2/data/conics/con08.txt
@@ -26,5 +26,3 @@ f 3 1  0 0
 {4*x^2 + 25*y^2 + 0*xy + -16*x + 0*y + -84} : (2.75552,1.97704) --cw--> (7,0)
 10
 6
-
-
diff --git a/Surface_sweep_2/test/Surface_sweep_2/data/conics/con09.txt b/Surface_sweep_2/test/Surface_sweep_2/data/conics/con09.txt
@@ -121,5 +121,4 @@ f 1 1  -4 0
 {1*x^2 + 1*y^2 + 0*xy + -8*x + 0*y + 0} : (8,0) --cw--> (4.5,-3.96863)
 {1*x^2 + 1*y^2 + 0*xy + -8*x + 0*y + 0} : (4.5,3.96863) --cw--> (8,0)
 59
-34
-
+41
diff --git a/Surface_sweep_2/test/Surface_sweep_2/data/conics/con10.txt b/Surface_sweep_2/test/Surface_sweep_2/data/conics/con10.txt
@@ -18,5 +18,4 @@ s 7 -2 3 2
 {1*x^2 + 1*y^2 + 0*xy + -14*x + 2*y + 49} : (8,-1) --cw--> (7,-2)
 {1*x^2 + 1*y^2 + 0*xy + -14*x + 2*y + 49} : (7,0) --cw--> (8,-1)
 8
-7
-
+5