Use more efficient parametric transformation for Tetrahedron (#159)

* Try new transform for tetrahedron * Document algorithm for clarity * Update style for similar Triangle function * Remove obsolete comment * Update comment style * Apply suggestions from code review Co-authored-by: Joshua Lampert <[email protected]> --------- Co-authored-by: Joshua Lampert <[email protected]>
JuliaGeometry · Dec 27, 2024 · 8de05a1 · 8de05a1
1 parent 16835af
commit 8de05a1
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 19 deletions.
diff --git a/src/specializations/Tetrahedron.jl b/src/specializations/Tetrahedron.jl
@@ -26,21 +26,28 @@ end
 #                               Parametric
 ################################################################################
 
-# Map argument domain from [0, 1]³ to Barycentric domain for (::Tetrahedron)(t1, t2, t3)
+# Map argument domain from [0, 1]³ to Barycentric domain for (::Tetrahedron)(t₁, t₂, t₃)
 function _parametric(tetrahedron::Meshes.Tetrahedron)
-    function f(t1, t2, t3)
-        if any(Iterators.map(n -> (n < 0) || (n > 1), (t1, t2, t3)))
-            msg = "tetrahedron(t1, t2, t3) is not defined for (t1, t2, t3) outside [0, 1]³."
-            throw(DomainError((t1, t2, t3), msg))
+    function f(t₁, t₂, t₃)
+        if any(Iterators.map(n -> (n < 0) || (n > 1), (t₁, t₂, t₃)))
+            msg = "tetrahedron(t₁, t₂, t₃) is not defined for (t₁, t₂, t₃) outside [0, 1]³."
+            throw(DomainError((t₁, t₂, t₃), msg))
         end
 
-        # Take a triangular cross-section at t3
-        a = tetrahedron(t3, 0, 0)
-        b = tetrahedron(0, t3, 0)
-        c = tetrahedron(0, 0, t3)
-        cross_section = _parametric(Meshes.Triangle(a, b, c))
-
-        return cross_section(t1, t2)
+        #=
+        Algorithm:
+        - Form a barycentric tetrahedron bounded by the points [0, 0, 0], [1, 0, 0],
+            [0, 1, 0], and [0, 0, 1].
+        - Use t₃ to take a triangular cross-section of the tetrahedron at points
+            [t₃, 0, 0], [0, t₃, 0], and [0, 0, t₃].
+        - Use t₂ to take a line segment cross-section of the triangle between
+            points [t₂t₃, 0, t₃ - t₂t₃] and [0, t₂t₃, t₃ - t₂t₃].
+        - Use t₁ to select a point along this line segment, i.e. ā + t₁(b̄ - ā).
+        =#
+        u₁ = (t₂ * t₃) - (t₁ * t₂ * t₃)
+        u₂ = t₁ * t₂ * t₃
+        u₃ = t₃ - (t₂ * t₃)
+        return tetrahedron(u₁, u₂, u₃)
     end
     return f
 end
diff --git a/src/specializations/Triangle.jl b/src/specializations/Triangle.jl
@@ -26,16 +26,24 @@ end
 #                              Parametric
 ################################################################################
 
-# Map argument domain from [0, 1]² to Barycentric domain for (::Triangle)(t1, t2)
+# Map argument domain from [0, 1]² to Barycentric domain for (::Triangle)(t₁, t₂)
 function _parametric(triangle::Meshes.Triangle)
-    function f(t1, t2)
-        if any(Iterators.map(n -> (n < 0) || (n > 1), (t1, t2)))
-            msg = "triangle(t1, t2) is not defined for (t1, t2) outside [0, 1]²."
-            throw(DomainError((t1, t2), msg))
+    function f(t₁, t₂)
+        if any(Iterators.map(n -> (n < 0) || (n > 1), (t₁, t₂)))
+            msg = "triangle(t₁, t₂) is not defined for (t₁, t₂) outside [0, 1]²."
+            throw(DomainError((t₁, t₂), msg))
         end
 
-        t1t2 = t1 * t2
-        return triangle(t1t2, t2 - t1t2)
+        #=
+        Algorithm:
+        - Form a barycentric triangle bounded by the points [0, 0], [1, 0], and [0, 1].
+        - Use t₂ to take a line segment cross-section of the triangle between points
+            [0, t₂] and [t₂, 0].
+        - Use t₁ to select a point along this line segment, i.e. ā + t₁(b̄ - ā).
+        =#
+        u₁ = t₁ * t₂
+        u₂ = t₂ - (t₁ * t₂)
+        return triangle(u₁, u₂)
     end
     return f
 end