fix: removed popping from x_acc and implemented filtering instead

Author: connorferster

src/load_distribution/load_distribution.py

@@ -215,31 +215,36 @@ def singularities_to_polygon(los: list[Singularity], xy: bool = False) -> Polygo
     # required shape, even if that means the exact x value is omitted (because we are
     # keeping the value immediately to the left and immediately to the right instead).
     x_acc = sorted(list(set(x_acc)))
-
     x_ord_count = Counter([round(x, 6) for x in x_acc])
     to_filter = []
     for key, count in x_ord_count.items():
         if count == 3:
             to_filter.append(key)
 
+    filtered_indexes = []
     if to_filter:
         rounded_x_acc = [round(x, 6) for x in x_acc]
         for filter_val in to_filter:
             index = rounded_x_acc.index(filter_val)
-            x_acc.pop(index)
+            filtered_indexes.append(index + 1)
+
+    filtered_x = []
+    for idx, x_val in enumerate(x_acc):
+        if idx not in filtered_indexes:
+            filtered_x.append(x_val)
 
     # Now, for every x value, compute the corresponding y value
-    y_acc = [sum([sing(x) for sing in sorted_sings]) for x in x_acc[:-1]]
+    y_acc = [sum([sing(x) for sing in sorted_sings]) for x in filtered_x[:-1]]
     # Always ends on 0.0
     y_acc.append(0.0)
     if xy:
         return x_acc, y_acc
     else:
         precision = n if n else 2
         xy_acc = zip(
-            [round(x, precision) for x in x_acc], [round(y, precision) for y in y_acc]
+            [round(x, precision) for x in filtered_x],
+            [round(y, precision) for y in y_acc],
         )
-
         return Polygon(xy_acc)
 
 

tests/test_data.py

@@ -1,6 +1,8 @@
 from load_distribution import Singularity
 import numpy as np
 
+# An output from papermodels that caused an error in the singularities_to_polygon function due to lots of list popping
+
 big_list_o_singularities = [
     Singularity(
         x0=6.628,

tests/test_load_distribution.py

@@ -241,8 +241,9 @@ def test_singularities_to_polygon():
     # because of the popping
 
     assert (
-        ld.singularities_to_polygon(data.big_list_o_singularities).wkt
-    ) == "FAILING TEST"
+        (ld.singularities_to_polygon(data.big_list_o_singularities).wkt)
+        == "POLYGON ((0 0, 0.001 0, 0.001 3396.431373, 0.413 3396.431373, 0.413 -1656.718815, 3.172 -1656.718815, 3.172 -2981.839131, 3.504 -2981.839131, 3.504 -1325.120316, 6.628 -1325.120316, 6.628 -1991.55609, 6.876 -1991.55609, 6.876 -666.435774, 7.57 -666.435774, 7.57 3157.111452, 7.859 3157.111452, 7.859 0, 0 0))"
+    )
 
 
 def test_overlap_region_to_singularity():