Update unit test to avoid using principal curvatures.

Author: qnzhou

tests/test_all.py

@@ -652,46 +652,46 @@ def test_compute_frame_field_bisectors(icosahedron):
 def test_comb_cross_field(icosahedron):
     V,F = icosahedron
 
-    # Get principal curvature directions (cross field)
-    PD1,PD2,_,_,_ = igl.principal_curvature(V,F)
+    # Get local basis
+    B1,B2,_ = igl.local_basis(V,F)
 
     # Comb the cross field
-    PD1_combed,PD2_combed = igl.comb_cross_field(V,F,PD1,PD2)
+    B1_combed,B2_combed = igl.comb_cross_field(V,F,B1,B2)
 
     # Check output shapes
-    assert PD1_combed.shape == (F.shape[0], 3)
-    assert PD2_combed.shape == (F.shape[0], 3)
+    assert B1_combed.shape == (F.shape[0], 3)
+    assert B2_combed.shape == (F.shape[0], 3)
 
 def test_cross_field_mismatch(icosahedron):
     V,F = icosahedron
 
-    # Get principal curvature directions (cross field)
-    PD1,PD2,_,_,_ = igl.principal_curvature(V,F)
+    # Get local basis
+    B1,B2,_ = igl.local_basis(V,F)
 
     # Comb the cross field first
-    PD1_combed,PD2_combed = igl.comb_cross_field(V,F,PD1,PD2)
+    B1_combed,B2_combed = igl.comb_cross_field(V,F,B1,B2)
 
     # Compute mismatch on combed field
-    mismatch = igl.cross_field_mismatch(V,F,PD1_combed,PD2_combed,True)
+    mismatch = igl.cross_field_mismatch(V,F,B1_combed,B2_combed,True)
 
     # Check output shape (should be #F by 3 for triangular mesh)
     assert mismatch.shape == (F.shape[0], 3)
 
     # Test with uncombed field (function will comb it first)
-    mismatch_uncombed = igl.cross_field_mismatch(V,F,PD1,PD2,False)
+    mismatch_uncombed = igl.cross_field_mismatch(V,F,B1,B2,False)
     assert mismatch_uncombed.shape == (F.shape[0], 3)
 
 def test_find_cross_field_singularities(icosahedron):
     V,F = icosahedron
 
-    # Get principal curvature directions (cross field)
-    PD1,PD2,_,_,_ = igl.principal_curvature(V,F)
+    # Get local basis
+    B1,B2,_ = igl.local_basis(V,F)
 
-    # Comb the cross field
-    PD1_combed,PD2_combed = igl.comb_cross_field(V,F,PD1,PD2)
+    # Comb the cross field first
+    B1_combed,B2_combed = igl.comb_cross_field(V,F,B1,B2)
 
     # Compute mismatch
-    mismatch = igl.cross_field_mismatch(V,F,PD1_combed,PD2_combed,True)
+    mismatch = igl.cross_field_mismatch(V,F,B1_combed,B2_combed,True)
 
     # Find singularities from mismatch
     isSingularity,singularityIndex = igl.find_cross_field_singularities(V,F,mismatch)
@@ -704,7 +704,7 @@ def test_find_cross_field_singularities(icosahedron):
     assert singularityIndex.shape[0] == V.shape[0]
 
     # Test overload that computes mismatch internally
-    isSingularity2,singularityIndex2 = igl.find_cross_field_singularities(V,F,PD1_combed,PD2_combed,True)
+    isSingularity2,singularityIndex2 = igl.find_cross_field_singularities(V,F,B1_combed,B2_combed,True)
 
     # Check Poincaré-Hopf theorem
     assert np.sum(singularityIndex2) == 2 * 4 # Euler characteristic * 4-rosy fields
@@ -714,7 +714,7 @@ def test_find_cross_field_singularities(icosahedron):
     assert singularityIndex2.shape[0] == V.shape[0]
 
     # Test with uncombed field
-    isSingularity3,singularityIndex3 = igl.find_cross_field_singularities(V,F,PD1,PD2,False)
+    isSingularity3,singularityIndex3 = igl.find_cross_field_singularities(V,F,B1,B2,False)
     assert isSingularity3.shape[0] == V.shape[0]
     assert singularityIndex3.shape[0] == V.shape[0]
 
@@ -724,17 +724,17 @@ def test_find_cross_field_singularities(icosahedron):
 def test_comb_frame_field(icosahedron):
     V,F = icosahedron
 
-    # Get principal curvature directions (frame field)
-    PD1,PD2,_,_,_ = igl.principal_curvature(V,F)
+    # Get local basis
+    B1,B2,_ = igl.local_basis(V,F)
 
     # Compute bisectors
-    BIS1,BIS2 = igl.compute_frame_field_bisectors(V,F,PD1,PD2)
+    BIS1,BIS2 = igl.compute_frame_field_bisectors(V,F,B1,B2)
 
     # Comb the bisectors (which are a cross field)
     BIS1_combed,BIS2_combed = igl.comb_cross_field(V,F,BIS1,BIS2)
 
     # Comb the frame field using combed bisectors
-    PD1_combed,PD2_combed = igl.comb_frame_field(V,F,PD1,PD2,BIS1_combed,BIS2_combed)
+    PD1_combed,PD2_combed = igl.comb_frame_field(V,F,B1,B2,BIS1_combed,BIS2_combed)
 
     # Check output shapes
     assert PD1_combed.shape == (F.shape[0], 3)