the change to doublearea seems to break another test

sgsellan · Apr 18, 2024 · 1c855b0 · 1c855b0
1 parent d1ea45a
commit 1c855b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/gpytoolbox/doublearea_intrinsic.py b/src/gpytoolbox/doublearea_intrinsic.py
@@ -39,7 +39,6 @@ def doublearea_intrinsic(l_sq,F):
     # Using Kahan's formula
     # https://people.eecs.berkeley.edu/~wkahan/Triangle.pdf
     a,b,c = l[:,0], l[:,1], l[:,2]
-    arg = (a+(b+c)) * (c-(a-b)) * (c+(a-b)) * (a+(b-c))
-    dblA = 0.5 * np.sqrt(np.maximum(arg, 0.))
+    dblA = 0.5 * np.sqrt((a+(b+c)) * (c-(a-b)) * (c+(a-b)) * (a+(b-c)))
 
     return dblA
diff --git a/test/test_triangulate.py b/test/test_triangulate.py
@@ -65,7 +65,8 @@ def test_image(self):
         def check(V,F,area=np.inf,angle=0):
             self.assertTrue(len(gpy.non_manifold_edges(F))==0)
             self.assertTrue((np.abs(V)<1.+1e-6).all())
-            self.assertTrue((gpy.doublearea(V,F)<2.*area+1e-6).all())
+            dA = gpy.doublearea(V,F)
+            self.assertTrue((dA[np.isfinite(dA)]<2.*area+1e-6).all())
             self.assertTrue((gpy.tip_angles(V,F)>angle-1e-6).all())
 
         # Convex hull