Move Delaunay propagation function

Signed-off-by: pacien <pacien.trangirard@pacien.net>

2 files changed, 26 insertions, 27 deletions

diff --git a/test/morpher/quadrilateral.c b/test/morpher/quadrilateral.c
index b278e2f..31b22d6 100644
--- a/test/morpher/quadrilateral.c
+++ b/test/morpher/quadrilateral.c
@@ -53,34 +53,9 @@ static void test_quadrilateral_is_delaunay(CartesianMapping A, CartesianMapping
   trianglemap_destroy(r);
 }
 
-static void test_quadrilateral_propagate_delaunay() {
-  CartesianMapping A = m(0, 0), B = m(0, 10), C = m(10, 10), D = m(10, 0), E = m(4, 6), F = m(8, 7);
-  TriangleMap *l = trianglemap_create(A, B, C);
-  TriangleMap *r = trianglemap_create(A, C, D);
-  trianglemap_set_neighbors(l, NULL, NULL, r, r);
-  trianglemap_set_neighbors(r, l, NULL, NULL, NULL);
-  trianglemap_split(l, E);
-  trianglemap_split(r, F);
-
-  trianglemap_foreach_neighbor(r, quadrilateral_propagate_delaunay);
-
-  {
-    TriangleMap *triangle;
-    int neighbor_index;
-    for (triangle = l; triangle != NULL; triangle = triangle->next)
-      for (neighbor_index = 0; neighbor_index < 3; ++neighbor_index)
-        if (triangle->neighbors[neighbor_index] != NULL)
-          assert(quadrilateral_is_delaunay(triangle, triangle->neighbors[neighbor_index]));
-  }
-
-  trianglemap_destroy(l);
-  trianglemap_destroy(r);
-}
-
 int main(int argc, char **argv) {
   test_quadrilateral_flip_diagonal();
   test_quadrilateral_is_delaunay(m(0, 0), m(0, 3), m(3, 3), m(2, 1), false);
   test_quadrilateral_is_delaunay(m(0, 0), m(0, 3), m(3, 3), m(4, -1), true);
-  test_quadrilateral_propagate_delaunay();
   return 0;
 }
diff --git a/test/morpher/trianglemap.c b/test/morpher/trianglemap.c
index 608f3c9..a00f89b 100644
--- a/test/morpher/trianglemap.c
+++ b/test/morpher/trianglemap.c
@@ -1,8 +1,7 @@
 #include "morpher/trianglemap.h"
 #include <stdlib.h>
 #include <assert.h>
-#include <stdio.h>
-#include "common/geom.h"
+#include "morpher/quadrilateral.h"
 
 static inline bool neighbors_equals(TriangleMap *neighbors[],
                                     TriangleMap *n1, TriangleMap *n2, TriangleMap *n3) {
@@ -64,8 +63,33 @@ static void test_triangle_split() {
   free_map(t);
 }
 
+static void test_trianglemap_propagate_delaunay() {
+  CartesianMapping A = m(0, 0), B = m(0, 10), C = m(10, 10), D = m(10, 0), E = m(4, 6), F = m(8, 7);
+  TriangleMap *l = trianglemap_create(A, B, C);
+  TriangleMap *r = trianglemap_create(A, C, D);
+  trianglemap_set_neighbors(l, NULL, NULL, r, r);
+  trianglemap_set_neighbors(r, l, NULL, NULL, NULL);
+  trianglemap_split(l, E);
+  trianglemap_split(r, F);
+
+  trianglemap_propagate_delaunay(r);
+
+  {
+    TriangleMap *triangle;
+    int neighbor_index;
+    for (triangle = l; triangle != NULL; triangle = triangle->next)
+      for (neighbor_index = 0; neighbor_index < 3; ++neighbor_index)
+        if (triangle->neighbors[neighbor_index] != NULL)
+          assert(quadrilateral_is_delaunay(triangle, triangle->neighbors[neighbor_index]));
+  }
+
+  trianglemap_destroy(l);
+  trianglemap_destroy(r);
+}
+
 int main(int argc, char **argv) {
   test_triangle_to();
   test_triangle_split();
+  test_trianglemap_propagate_delaunay();
   return 0;
 }