Fix naming of get_centers_and_bounding_boxes; update corresponding test

Author: constantinpape

micro_sam/prompt_generators.py

@@ -11,13 +11,13 @@ class PointAndBoxPromptGenerator:
     You can use this class to derive prompts from an instance segmentation, either for
     evaluation purposes or for training Segment Anything on custom data.
     In order to use this generator you need to precompute the bounding boxes and center
-    coordiantes of the instance segmentation, using e.g. `util.get_bounding_boxes_and_centers`.
+    coordiantes of the instance segmentation, using e.g. `util.get_centers_and_bounding_boxes`.
     Here's an example for how to use this class:
     ```python
     # Initialize generator for 1 positive and 4 negative point prompts.
     prompt_generator = PointAndBoxPromptGenerator(1, 4, dilation_strength=8)
     # Precompute the bounding boxes for the given segmentation
-    bounding_boxes, _ = util.get_bounding_boxes_and_centes(segmentation)
+    bounding_boxes, _ = util.get_centers_and_bounding_boxes(segmentation)
     # generate point prompts for the object with id 1 in 'segmentation'
     seg_id = 1
     points, point_labels, _, _ = prompt_generator(segmentation, seg_id, bounding_boxes)

micro_sam/util.py

@@ -450,7 +450,7 @@ def compute_iou(mask1: np.ndarray, mask2: np.ndarray) -> float:
     return iou
 
 
-def get_bounding_boxes_and_centers(
+def get_centers_and_bounding_boxes(
     segmentation: np.ndarray,
     mode: str = "v"
 ) -> tuple[Mapping[int, np.ndarray], Mapping[int, tuple]]:

test/test_prompt_generators.py

@@ -41,12 +41,12 @@ def _debug(self, mask, center, box, coords, point_labels):
 
     def test_point_prompt_generator(self):
         from micro_sam.prompt_generators import PointAndBoxPromptGenerator
-        from micro_sam.util import get_cell_center_coordinates
+        from micro_sam.util import get_centers_and_bounding_boxes
 
         labels = self._get_test_data()
         label_ids = np.unique(labels)[1:]
 
-        centers, boxes = get_cell_center_coordinates(labels)
+        centers, boxes = get_centers_and_bounding_boxes(labels)
 
         test_point_pairs = [(1, 0), (1, 1), (4, 3), (2, 4), (3, 9), (13, 27)]
         for (n_pos, n_neg) in test_point_pairs:
@@ -70,12 +70,12 @@ def test_point_prompt_generator(self):
 
     def test_box_prompt_generator(self):
         from micro_sam.prompt_generators import PointAndBoxPromptGenerator
-        from micro_sam.util import get_cell_center_coordinates
+        from micro_sam.util import get_centers_and_bounding_boxes
 
         labels = self._get_test_data()
         label_ids = np.unique(labels)[1:]
 
-        centers, boxes = get_cell_center_coordinates(labels)
+        centers, boxes = get_centers_and_bounding_boxes(labels)
         generator = PointAndBoxPromptGenerator(0, 0, dilation_strength=0, get_point_prompts=False, get_box_prompts=True)
 
         for label_id in label_ids: