fixed implementation

UWARG · Dec 19, 2024 · 8991dc7 · 8991dc7
1 parent fe6c9e8
commit 8991dc7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/modules/cluster_estimation/cluster_estimation.py b/modules/cluster_estimation/cluster_estimation.py
@@ -58,7 +58,6 @@ class ClusterEstimation:
 
     __filter_by_covariances()
         Removes any cluster with covariances much higher than the lowest covariance value.
-
     """
 
     __create_key = object()
@@ -179,12 +178,13 @@ def run(
 
         # init search parameters
         ptr = 0
-        max_label = self.__current_bucket[0][2]
 
-        # itterates through all possible labels
-        for label in reversed(range(max_label)):
+        # itterates through all points
+        while ptr <= len(self.__current_bucket):
+            # reference label
+            label = self.__current_bucket[ptr][2]
 
-            # creates bucket of labels
+            # creates bucket of points with the same label
             bucket_labelled = []
             while ptr < len(self.__current_bucket) and self.__current_bucket[ptr][2] == label:
                 bucket_labelled += [self.__current_bucket[ptr]]
@@ -200,7 +200,9 @@ def run(
 
             # checks if cluster_by_label ran succssfully
             if not check:
-                self.__logger(f"did not add objects of label={label} to total object detections")
+                self.__logger.warning(
+                    f"did not add objects of label={label} to total object detections"
+                )
                 continue
 
             detections_in_world += labelled_detections_in_world

diff --git a/modules/common b/modules/common
+5 −1		modules/camera/base_camera.py
+6 −3		modules/camera/camera_factory.py
+23 −2		modules/camera/camera_opencv.py
+73 −10		modules/camera/camera_picamera2.py
+0 −0		modules/data_encoding/__init__.py
+73 −0		modules/data_encoding/message_encoding_decoding.py
+70 −0		modules/data_encoding/metadata_encoding_decoding.py
+28 −0		modules/data_encoding/worker_enum.py
+62 −47		modules/logger/logger.py
+21 −6		modules/logger/logger_main_setup.py
+1 −1		pyproject.toml
+8 −2		tests/integration/test_camera_opencv.py
+13 −3		tests/integration/test_camera_picamera2.py
+6 −2		tests/integration/test_camera_qr_example.py
+38 −0		tests/unit/data_encoding/test_message_encoding_decoding.py
+34 −0		tests/unit/data_encoding/test_metadata_encoding_decoding.py
+46 −10		tests/unit/test_logger.py