separate cv_ins and cv_del + bump to 0.4

hoho/wed.py

@@ -28,7 +28,17 @@ 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/4, ce=1.0, normalized=True, preregister=True, single_scale=True):
+def update_cv(cv, gt_vertices):
+    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()
+    return cv
+
+def compute_WED(pd_vertices, pd_edges, gt_vertices, gt_edges, cv_ins=-1/2, cv_del=-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
@@ -51,13 +61,9 @@ def compute_WED(pd_vertices, pd_edges, gt_vertices, gt_edges, cv=-1/4, ce=1.0, n
     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()
+    cv_del = update_cv(cv_del, gt_vertices)
+    cv_ins = update_cv(cv_ins, gt_vertices)
+    
     # Step 0: Prenormalize / preregister
         
 
@@ -74,11 +80,11 @@ def compute_WED(pd_vertices, pd_edges, gt_vertices, gt_edges, cv=-1/4, ce=1.0, n
     
     # Additional: Vertex Deletion
     unmatched_pd_indices = set(range(len(pd_vertices))) - set(row_ind)
-    deletion_costs = cv * len(unmatched_pd_indices)  
+    deletion_costs = cv_del * len(unmatched_pd_indices)  
     
     # Step 3: Vertex Insertion
     unmatched_gt_indices = set(range(len(gt_vertices))) - set(col_ind)
-    insertion_costs = cv * len(unmatched_gt_indices)  
+    insertion_costs = cv_ins * len(unmatched_gt_indices)  
     
     # Step 4: Edge Deletion and Insertion
     updated_pd_edges = [(col_ind[np.where(row_ind == edge[0])[0][0]], col_ind[np.where(row_ind == edge[1])[0][0]]) for edge in pd_edges if edge[0] in row_ind and edge[1] in row_ind]

setup.py

@@ -6,7 +6,7 @@ with open('requirements.txt') as f:
     required = f.read().splitlines()
 
 setup(name='hoho',
-	version='0.0.3',
+	version='0.0.4',
 	description='Tools and utilites for the HoHo Dataset and S23DR Competition',
 	url='usm3d.github.io',
 	author='Jack Langerman, Dmytro Mishkin, S23DR Orgainizing Team',