Move Delaunay propagation function

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

6 files changed, 49 insertions, 46 deletions

diff --git a/include/morpher/quadrilateral.h b/include/morpher/quadrilateral.h
index 8691263..c8cf3a1 100644
--- a/include/morpher/quadrilateral.h
+++ b/include/morpher/quadrilateral.h
@@ -36,15 +36,4 @@ void quadrilateral_flip_diagonal(TriangleMap *t1, TriangleMap *t2);
  */
 bool quadrilateral_is_delaunay(TriangleMap *t1, TriangleMap *t2);
 
-/**
- * Function: quadrilateral_propagate_delaunay
- * Ensures that the quadrilateral spawned by the given triangles fulfills the Delaunay criterion,
- * flipping the diagonal if necessary and propagating the changes to the neighbouring triangles.
- *
- * Parameters:
- *   *start    - the starting triangle
- *   *neighbor - a neighboring triangle
- */
-void quadrilateral_propagate_delaunay(TriangleMap *start, TriangleMap *neighbor);
-
 #endif
diff --git a/include/morpher/trianglemap.h b/include/morpher/trianglemap.h
index 0bb6a1d..f690a37 100644
--- a/include/morpher/trianglemap.h
+++ b/include/morpher/trianglemap.h
@@ -116,6 +116,16 @@ void trianglemap_replace_neighbor(TriangleMap *t, TriangleMap *old, TriangleMap
 void trianglemap_foreach_neighbor(TriangleMap *t, void (*f)(TriangleMap *current, TriangleMap *neighbor));
 
 /**
+ * Function: trianglemap_propagate_delaunay
+ * Ensures that the quadrilateral spawned by the given triangles and its neighbours fulfill the Delaunay criterion,
+ * flipping the diagonal if necessary and propagating the changes to the neighbouring triangles.
+ *
+ * Parameters:
+ *   *t - the starting triangle
+ */
+void trianglemap_propagate_delaunay(TriangleMap *t);
+
+/**
  * Function: trianglemap_split
  * Splits a triangle into three sub-triangles at the supplied center vertex, updating the surrounding triangles.
  * The first triangle resulting from the split is returned, with the two others chained as linear neighbours.
diff --git a/src/morpher/quadrilateral.c b/src/morpher/quadrilateral.c
index af77f0f..9c73dfa 100644
--- a/src/morpher/quadrilateral.c
+++ b/src/morpher/quadrilateral.c
@@ -61,11 +61,3 @@ bool quadrilateral_is_delaunay(TriangleMap *t1, TriangleMap *t2) {
   return not_in_circumcircle(t1, t2->vertices[(trianglemap_find_common_edge(t2, t1) + 2) % 3].origin) &&
          not_in_circumcircle(t2, t1->vertices[(trianglemap_find_common_edge(t1, t2) + 2) % 3].origin);
 }
-
-void quadrilateral_propagate_delaunay(TriangleMap *start, TriangleMap *neighbor) {
-  assert(start != NULL && neighbor != NULL);
-  if (!quadrilateral_is_delaunay(start, neighbor)) {
-    quadrilateral_flip_diagonal(start, neighbor);
-    trianglemap_foreach_neighbor(neighbor, quadrilateral_propagate_delaunay);
-  }
-}
diff --git a/src/morpher/trianglemap.c b/src/morpher/trianglemap.c
index 01b66c9..6658901 100644
--- a/src/morpher/trianglemap.c
+++ b/src/morpher/trianglemap.c
@@ -1,8 +1,17 @@
 #include "morpher/trianglemap.h"
 #include <stdlib.h>
 #include <assert.h>
+#include "morpher/quadrilateral.h"
 #include "common/mem.h"
 
+static void propagate_delaunay(TriangleMap *start, TriangleMap *neighbor) {
+  assert(start != NULL && neighbor != NULL);
+  if (!quadrilateral_is_delaunay(start, neighbor)) {
+    quadrilateral_flip_diagonal(start, neighbor);
+    trianglemap_foreach_neighbor(neighbor, propagate_delaunay);
+  }
+}
+
 TriangleMap *trianglemap_create(CartesianMapping v1, CartesianMapping v2, CartesianMapping v3) {
   TriangleMap *triangle = malloc_or_die(sizeof(TriangleMap));
   triangle->vertices[0] = v1;
@@ -51,6 +60,10 @@ void trianglemap_foreach_neighbor(TriangleMap *t, void (*f)(TriangleMap *, Trian
   for (cursor = 0; cursor < 3; ++cursor) if (t->neighbors[cursor] != NULL) f(t, t->neighbors[cursor]);
 }
 
+void trianglemap_propagate_delaunay(TriangleMap *t) {
+  trianglemap_foreach_neighbor(t, propagate_delaunay);
+}
+
 TriangleMap *trianglemap_split(TriangleMap *t, CartesianMapping v) {
   assert(trianglemap_to(t, v.origin) == t);
 
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;
 }