refactor cv + fix calc

hoho/wed.py

@@ -28,13 +28,13 @@ def preregister_mean_std(verts_to_transform, target_verts, single_scale=True):
     return transformed_verts
 
 
-def compute_WED(pd_vertices, pd_edges, gt_vertices, gt_edges, cv=-1, ce=1.0, normalized=True, preregister=True, single_scale=True):
+def compute_WED(pd_vertices, pd_edges, gt_vertices, gt_edges, cv=-1/4, ce=1.0, normalized=True, preregister=True, single_scale=True):
     '''The function computes the Wireframe Edge Distance (WED) between two graphs.
     pd_vertices: list of predicted vertices
     pd_edges: list of predicted edges
     gt_vertices: list of ground truth vertices
     gt_edges: list of ground truth edges
-    cv: vertex cost (the cost in centimeters of missing a vertex, default is -1, which means 1/4 of the diameter of the ground truth mesh)
+    cv: vertex cost: if positive, the cost in centimeters of missing a vertex, if negative, multiplies diameter to compute cost (default is -1/2)
     ce: edge cost (multiplier of the edge length for edge deletion and insertion, default is 1.0)
     normalized: if True, the WED is normalized by the total length of the ground truth edges
     preregister: if True, the predicted vertices have their mean and scale matched to the ground truth vertices
@@ -43,21 +43,23 @@ def compute_WED(pd_vertices, pd_edges, gt_vertices, gt_edges, cv=-1, ce=1.0, nor
     # Vertex coordinates are in centimeters. When cv and ce are set to 100.0 and 1.0 respectively, 
     # missing a vertex is equivanlent predicting it 1 meter away from the ground truth vertex.
     # This is equivalent to setting cv=1 and ce=1 when the vertex coordinates are in meters.
-    # When a negative cv value is set (the default behavior), cv is reset to 1/4 of the diameter of the ground truth wireframe.
+    # When a negative cv value is set (the default behavior), cv is reset to 1/2 of the diameter of the ground truth wireframe.
     
     pd_vertices = np.array(pd_vertices)
     gt_vertices = np.array(gt_vertices)
     
-    diameter = cdist(gt_vertices, gt_vertices).max()
-    
-    if cv < 0:
-        cv = diameter / 4.0 
-        # Cost of addining or deleting a vertex is set to 1/4 of the diameter of the ground truth mesh
-    
-    # Step 0: Prenormalize / preregister
     if preregister:
         pd_vertices = preregister_mean_std(pd_vertices, gt_vertices, single_scale=single_scale)
         
+    if cv < 0:
+        diameter = cdist(gt_vertices, gt_vertices).max()
+        # Cost of adding or deleting a vertex is set to -cv times the diameter of the ground truth wireframe
+        cv = -cv * diameter
+    elif cv == 0:
+        # Cost of adding or deleting a vertex is set to the average distance of the ground truth vertices from their mean
+        cv = np.linalg.norm(np.mean(gt_vertices, axis=0) - gt_vertices, axis=1).mean()
+    # Step 0: Prenormalize / preregister
+        
 
     pd_edges = np.array(pd_edges)
     gt_edges = np.array(gt_edges)