(1)vertex and connection color_thr; (2)skip pruning

handcrafted_solution.py

@@ -126,9 +126,12 @@ def get_vertices_and_edges_from_two_segmentations(ade_seg_np, gest_seg_np, edge_
     '''Get the vertices and edges from the gestalt segmentation mask of the house'''
     vertices = []
     connections = []
-    print(f'gest_seg_np[0,0]= {gest_seg_np[0,0]}')
+
+    color_th = 10.0 # Cost ->2.6
+
+    #-------------------------    
     # combined map from ade
-    print(gest_seg_np.shape, ade_seg_np.shape)
+    #print(gest_seg_np.shape, ade_seg_np.shape)
     ade_color0 = np.array([0,0,0]) 
     ade_mask0 = cv2.inRange(ade_seg_np,  ade_color0-0.5, ade_color0+0.5)
     ade_color1 = np.array([120,120,120]) 
@@ -139,15 +142,15 @@ def get_vertices_and_edges_from_two_segmentations(ade_seg_np, gest_seg_np, edge_
     ade_mask3 = cv2.inRange(ade_seg_np,  ade_color3-0.5, ade_color3+0.5)
     ade_mask = cv2.bitwise_or(ade_mask3, ade_mask2)
     ade_mask = cv2.bitwise_or(ade_mask1, ade_mask)
-    print(ade_mask.any())
+    #print(ade_mask.any())
     apex_map = np.zeros(ade_seg_np.shape)
     apex_map_on_ade = ade_seg_np 
     apex_map_on_gest = gest_seg_np
     # Apex
     apex_color = np.array(gestalt_color_mapping['apex'])
-    print(f'apex_color= {apex_color}')
-    apex_mask = cv2.inRange(gest_seg_np,  apex_color-0.5, apex_color+0.5) 
-    # apex_mask = cv2.inRange(gest_seg_np,  apex_color-10, apex_color+10) # include more pts
+    #print(f'apex_color= {apex_color}')
+    #apex_mask = cv2.inRange(gest_seg_np,  apex_color-0.5, apex_color+0.5) 
+    apex_mask = cv2.inRange(gest_seg_np,  apex_color-color_th, apex_color+color_th) # include more pts
     # apex_mask = cv2.bitwise_and(apex_mask, ade_mask) # remove pts
     if apex_mask.sum() > 0:
         output = cv2.connectedComponentsWithStats(apex_mask, 8, cv2.CV_32S)
@@ -158,7 +161,7 @@ def get_vertices_and_edges_from_two_segmentations(ade_seg_np, gest_seg_np, edge_
             vert = {"xy": centroids[i], "type": "apex"}
             vertices.append(vert)
 
-            print(f'centroids[i]={centroids[i]}')
+            #print(f'centroids[i]={centroids[i]}')
             uu = int(centroids[i][1])
             vv = int(centroids[i][0])
             # plot a cross
@@ -184,8 +187,9 @@ def get_vertices_and_edges_from_two_segmentations(ade_seg_np, gest_seg_np, edge_
     
 
     eave_end_color = np.array(gestalt_color_mapping['eave_end_point'])
-    eave_end_mask = cv2.inRange(gest_seg_np,  eave_end_color-0.5, eave_end_color+0.5)
-    eave_end_mask = cv2.bitwise_and(eave_end_mask, ade_mask)
+    #eave_end_mask = cv2.inRange(gest_seg_np,  eave_end_color-0.5, eave_end_color+0.5)
+    eave_end_mask = cv2.inRange(gest_seg_np,  eave_end_color-color_th, eave_end_color+color_th)
+    #eave_end_mask = cv2.bitwise_and(eave_end_mask, ade_mask)
     if eave_end_mask.sum() > 0:
         output = cv2.connectedComponentsWithStats(eave_end_mask, 8, cv2.CV_32S)
         (numLabels, labels, stats, centroids) = output
@@ -204,14 +208,15 @@ def get_vertices_and_edges_from_two_segmentations(ade_seg_np, gest_seg_np, edge_
         apex_pts_idxs.append(j)
     apex_pts = np.array(apex_pts)
             
-    # Ridge connects two apex points
+    # Ridge connects two apex points    
+    line_img = np.copy(gest_seg_np) * 0
     for edge_class in ['eave', 'ridge', 'rake', 'valley']:
         edge_color = np.array(gestalt_color_mapping[edge_class])
         mask = cv2.morphologyEx(cv2.inRange(gest_seg_np,
-                                            edge_color-0.5,
-                                            edge_color+0.5),
+                                            edge_color-color_th,
+                                            edge_color+color_th),
                                 cv2.MORPH_DILATE, np.ones((11, 11)))
-        line_img = np.copy(gest_seg_np) * 0
+        #line_img = np.copy(gest_seg_np) * 0
         if mask.sum() > 0:
             output = cv2.connectedComponentsWithStats(mask, 8, cv2.CV_32S)
             (numLabels, labels, stats, centroids) = output
@@ -226,7 +231,7 @@ def get_vertices_and_edges_from_two_segmentations(ade_seg_np, gest_seg_np, edge_
                 x_right = x[xright_idx]
                 y_right = y[xright_idx]
                 edges.append((x_left, y_left, x_right, y_right))
-                cv2.line(line_img, (x_left, y_left), (x_right, y_right), (255, 255, 255), 2)
+                cv2.line(line_img, (x_left, y_left), (x_right, y_right), (255, 255, 255), 2)          
             edges = np.array(edges)
             if (len(apex_pts) < 2) or len(edges) <1:
                 continue
@@ -239,6 +244,8 @@ def get_vertices_and_edges_from_two_segmentations(ade_seg_np, gest_seg_np, edge_
                     for a_i, a in enumerate(connected_verts):
                         for b in connected_verts[a_i+1:]:
                             connections.append((a, b))
+    filename_edges_map = f'edges_map_{rid}.jpg'
+    cv2.imwrite(filename_edges_map, line_img)
     return vertices, connections
 
 def get_uv_dept_category(vertices, depth, ade_seg):
@@ -383,7 +390,10 @@ def predict(entry, visualize=False) -> Tuple[np.ndarray, List[int]]:
         vertices_3d = cv2.convertPointsFromHomogeneous(vertices_3d).reshape(-1, 3)
         vert_edge_per_image[i] = vertices, connections, vertices_3d
     all_3d_vertices, connections_3d = merge_vertices_3d(vert_edge_per_image, 3.0)
-    all_3d_vertices_clean, connections_3d_clean  = prune_not_connected(all_3d_vertices, connections_3d)
+    print(f'after merge, {len(all_3d_vertices)} 3d vertices and {len(connections_3d)} 3d connections')
+    #all_3d_vertices_clean, connections_3d_clean  = prune_not_connected(all_3d_vertices, connections_3d)
+    all_3d_vertices_clean, connections_3d_clean  = all_3d_vertices, connections_3d # don't prune -> cost:2.0
+    #print(f'after pruning, {len(all_3d_vertices_clean)} 3d clean vertices and {len(connections_3d_clean)} 3d clean connections')
     if (len(all_3d_vertices_clean) < 2) or len(connections_3d_clean) < 1:
         print (f'Not enough vertices or connections in the 3D vertices')
         return (good_entry['__key__'], *empty_solution())