included flashing

handcrafted_solution.py

@@ -58,8 +58,8 @@ def get_vertices(image_gestalt, *, color_range=4., dialations=3, erosions=1, ker
 
     apex_mask = cv2.inRange(image_gestalt, apex_color - color_range, apex_color + color_range)
     eave_end_point_mask = cv2.inRange(image_gestalt, eave_end_point - color_range, eave_end_point + color_range)
-    # flashing_end_point_mask = cv2.inRange(image_gestalt, flashing_end_point - color_range, flashing_end_point + color_range)
-    # eave_end_point_mask = cv2.bitwise_or(eave_end_point_mask, flashing_end_point_mask)
+    flashing_end_point_mask = cv2.inRange(image_gestalt, flashing_end_point - color_range, flashing_end_point + color_range)
+    eave_end_point_mask = cv2.bitwise_or(eave_end_point_mask, flashing_end_point_mask)
 
     kernel = np.ones((kernel_size, kernel_size), np.uint8)
 
@@ -96,36 +96,10 @@ def convert_entry_to_human_readable(entry):
 
 def get_vertices_and_edges_from_segmentation(gest_seg_np, edge_th = 50.0):
     '''Get the vertices and edges from the gestalt segmentation mask of the house'''
-    vertices = []
     connections = []
     # Apex
     gest_seg_np = clean_image(gest_seg_np)
     apex_centroids, eave_end_point_centroids = get_vertices(gest_seg_np)
-    # apex_color = np.array(gestalt_color_mapping['apex'])
-    # apex_mask = cv2.inRange(gest_seg_np,  apex_color-0.5, apex_color+0.5)
-    # if apex_mask.sum() > 0:
-    #     output = cv2.connectedComponentsWithStats(apex_mask, 8, cv2.CV_32S)
-    #     (numLabels, labels, stats, centroids) = output
-    #     stats, centroids = stats[1:], centroids[1:]
-    #
-    #     for i in range(numLabels-1):
-    #         vert = {"xy": centroids[i], "type": "apex"}
-    #         vertices.append(vert)
-    #
-    # 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)
-    # if eave_end_mask.sum() > 0:
-    #     output = cv2.connectedComponentsWithStats(eave_end_mask, 8, cv2.CV_32S)
-    #     (numLabels, labels, stats, centroids) = output
-    #     stats, centroids = stats[1:], centroids[1:]
-    #
-    #     for i in range(numLabels-1):
-    #         vert = {"xy": centroids[i], "type": "eave_end_point"}
-    #         vertices.append(vert)
-    # Connectivity
-    # apex_pts = []
-    # for j, v in enumerate(vertices):
-    #     apex_pts.append(v['xy'])
     apex_pts = np.concatenate([apex_centroids, eave_end_point_centroids])
             
     # Ridge connects two apex points