trenchfoot 0.4.3__py3-none-any.whl → 0.4.5__py3-none-any.whl

trenchfoot/scenarios/SUMMARY.json

@@ -1,6 +1,6 @@
 {
   "out_root": "/home/liam/projects/chiark/trenchfoot/packages/trenchfoot/scenarios",
-  "preview_enabled": true,
+  "preview_enabled": false,
   "volumetric_requested": false,
   "volumetric_available": false,
   "mesh_characteristic_length": 0.3,

trenchfoot/trench_scene_generator_v3.py

@@ -1216,18 +1216,30 @@ def make_ground_surface_plane(path_xy: List[Tuple[float,float]], width_top: floa
         return result
     else:
         # Open paths: ground forms annulus with extensions past trench endpoints.
-        # The outer ring (ground boundary) is extended, but the inner ring (trench
-        # opening) stays at its original position. This creates ground fill at the
-        # trench ends rather than extending the trench opening itself.
+        # The inner ring (trench opening) uses offset polyline with miter junctions.
+        # The outer ring (ground boundary) is a simple bounding rectangle to ensure
+        # full ground coverage - using offset polyline here would create miter junctions
+        # that "cut in" at corners, leaving gaps in the ground surface.
 
         # Inner boundary: trench opening at original position (not extended)
         L_inner, R_inner = _offset_polyline(path_xy, half_top)
         inner_ring = _ensure_ccw(_ring_from_LR(L_inner, R_inner))
 
-        # Outer boundary: offset by margin, extended at ends
-        L_outer, R_outer = _offset_polyline(path_xy, half_top + m)
-        L_outer_ext, R_outer_ext = _extend_polyline_ends(L_outer, R_outer, path_xy, m)
-        outer_ring = _ensure_ccw(_ring_from_LR(L_outer_ext, R_outer_ext))
+        # Outer boundary: bounding rectangle around trench opening, expanded by margin.
+        # This ensures the ground surface is rectangular and fully covers the area
+        # around the trench, avoiding miter junction artifacts at corners.
+        inner_ring_arr = np.array(inner_ring)
+        x_min = inner_ring_arr[:, 0].min() - m
+        x_max = inner_ring_arr[:, 0].max() + m
+        y_min = inner_ring_arr[:, 1].min() - m
+        y_max = inner_ring_arr[:, 1].max() + m
+        outer_ring = np.array([
+            [x_min, y_min],
+            [x_max, y_min],
+            [x_max, y_max],
+            [x_min, y_max],
+        ], dtype=float)
+        outer_ring = _ensure_ccw(outer_ring)
 
         # Triangulate the annular region (leaves hole open)
         combined_xy, tris = _triangulate_annulus(outer_ring, inner_ring)
@@ -1328,6 +1340,58 @@ def _point_inside_trench(
     return abs(local_u) <= half_w
 
 
+def _is_beyond_trench_ends(
+    x: float, y: float,
+    path_xy: List[Tuple[float, float]],
+) -> bool:
+    """Check if a point is beyond the ends of an open trench path.
+
+    For open paths (not closed loops), points that project beyond the first
+    or last vertex of the path are outside the trench void, even if their
+    perpendicular distance would put them within the trench walls.
+
+    Returns True if the point is beyond either end of an open path.
+    Returns False for closed paths (where there are no "ends").
+    """
+    if _is_path_closed(path_xy):
+        return False  # Closed paths have no ends to be beyond
+
+    P = np.array(path_xy, float)
+    query = np.array([x, y], float)
+
+    # Check start of path (s=0)
+    start = P[0]
+    if len(P) > 1:
+        # Tangent at start points in the direction of the path
+        tangent_start = P[1] - P[0]
+        tangent_start = tangent_start / (np.linalg.norm(tangent_start) + 1e-12)
+        # Vector from start to query point
+        to_query = query - start
+        # Distance along tangent (negative means before the start)
+        along_start = float(np.dot(to_query, tangent_start))
+        # The trench has a vertical end wall at the start vertex.
+        # Any point projecting before this wall is outside the trench.
+        if along_start < 0:
+            return True
+
+    # Check end of path (s=1)
+    end = P[-1]
+    if len(P) > 1:
+        # Tangent at end points in the direction we came from
+        tangent_end = P[-1] - P[-2]
+        tangent_end = tangent_end / (np.linalg.norm(tangent_end) + 1e-12)
+        # Vector from end to query point
+        to_query = query - end
+        # Distance along tangent (positive means past the end)
+        along_end = float(np.dot(to_query, tangent_end))
+        # The trench has a vertical end wall at the end vertex.
+        # Any point projecting past this wall is outside the trench.
+        if along_end > 0:
+            return True
+
+    return False
+
+
 @dataclass
 class TruncationResult:
     """Result of computing pipe truncation."""
@@ -1393,6 +1457,11 @@ def _compute_pipe_truncation(
         if abs(local_u) + effective_radius > half_w:
             return False
 
+        # Check trench end boundaries: for open trenches, pipe must not extend
+        # beyond the vertical end walls at the start/end of the path
+        if _is_beyond_trench_ends(x, y, path_xy):
+            return False
+
         return True
 
     def binary_search_boundary(t_inside: float, t_outside: float, tol: float = 0.001) -> float:

{trenchfoot-0.4.3.dist-info → trenchfoot-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trenchfoot
-Version: 0.4.3
+Version: 0.4.5
 Summary: Synthetic trench scenario generator bundle (surfaces + volumetrics).
 Author: Liam Moore
 License-File: LICENSE

{trenchfoot-0.4.3.dist-info → trenchfoot-0.4.5.dist-info}/RECORD

@@ -6,8 +6,8 @@ trenchfoot/gmsh_sloped_trench_mesher.py,sha256=D7EL6V0wkE6tvDARmm006yZE6KEzCl25O
 trenchfoot/plot_mesh.py,sha256=26dOlVfaM1WsUfr_sXVqA7axtY9qjY3WCNM7cUBTS7Q,3810
 trenchfoot/render_colors.py,sha256=CWMre6DYa2EyrCgZsEY0bv313WqEhQdr3CdPF1xI-40,1649
 trenchfoot/scene_spec_example.json,sha256=UcV25ku422UO0ZZPDrJwrT1zwmjoOIpnBdLuEdh-AZA,1028
-trenchfoot/trench_scene_generator_v3.py,sha256=ZWashBnNSWyv6Z_hh_zg8nngO4ySIuijgHtlCnqs0rY,75147
-trenchfoot/scenarios/SUMMARY.json,sha256=9bd-6Zi65TSplsJ4cZpUGY2zcPOGIqRp_RmbZ9P16Hc,6830
+trenchfoot/trench_scene_generator_v3.py,sha256=Ct8DCQ1iur0Ia7RyYbmCKr525p3Od7zQhd2Of1KcwFM,77837
+trenchfoot/scenarios/SUMMARY.json,sha256=BWcI0HA4DWG-XOsr3bVJZGK5VmNtxSaOG86kxihfmh0,6831
 trenchfoot/scenarios/S01_straight_vwalls/ground_truth_isosurface.html,sha256=SLPROqEefBB8OgmZSW6DBmJxuSDxVQhWTn9eG3q6QRU,5880178
 trenchfoot/scenarios/S01_straight_vwalls/metrics.json,sha256=WZsyUfDIcJW1FFHfNq1wF8zn0r-XL3jCrkmowV4OFwA,691
 trenchfoot/scenarios/S01_straight_vwalls/preview.png,sha256=adsx3-6oMu9WaixggXRhuXi_KM-q5s2RNSBLR_stq80,199624
@@ -16,56 +16,56 @@ trenchfoot/scenarios/S01_straight_vwalls/preview_side.png,sha256=zBqMghMiEAYvceP
 trenchfoot/scenarios/S01_straight_vwalls/preview_top.png,sha256=L0qGIFib1cAwSwJJ16cRtYSlPMOo4uQhNGt6OvM58XQ,39495
 trenchfoot/scenarios/S01_straight_vwalls/scene.json,sha256=kbHRC9zMVDGHbuLh2wRsvchfVfcbdDEVvxsMwHHBoHw,343
 trenchfoot/scenarios/S01_straight_vwalls/sdf_metadata.json,sha256=lo4IULejtQ0vg2rH8JDfRvB2WCxvUxM_N4JJjtBbU4Y,854
-trenchfoot/scenarios/S01_straight_vwalls/trench_scene.obj,sha256=g9cXh8VhbQJZWrUNJvHw90roxfRiuRkEWWxmWPtisd4,649
+trenchfoot/scenarios/S01_straight_vwalls/trench_scene.obj,sha256=MexC92x_MwFzKjHnbt12TYrL-UAJCb2qpjap5O9UkWg,563
 trenchfoot/scenarios/S01_straight_vwalls/meshes/trench_scene_culled.obj,sha256=6-usCEpAfhhZcdCxAy7NcXrkBwv-mEh40A6zN50k0Jo,519
 trenchfoot/scenarios/S01_straight_vwalls/point_clouds/culled/resolution0p050.pth,sha256=w4AKFbud2V0NhAtudGXXheLynAq-NLxUFSPxLczK3T0,1352093
 trenchfoot/scenarios/S01_straight_vwalls/point_clouds/full/resolution0p050.pth,sha256=w4AKFbud2V0NhAtudGXXheLynAq-NLxUFSPxLczK3T0,1352093
 trenchfoot/scenarios/S01_straight_vwalls/volumetric/trench_volume.msh,sha256=mpKNhdAPEogyDQrE9IGTgg535ZBNYXiLpIcmvl6QYPA,15007
 trenchfoot/scenarios/S02_straight_slope_pipe/ground_truth_isosurface.html,sha256=vHMtovoUUkmSGVh150se7hJERRBILzGr0iZYaJ6R1pw,6321783
-trenchfoot/scenarios/S02_straight_slope_pipe/metrics.json,sha256=DB-jNM62lZQiSaAy5meyYL92qIsUyrpFW2s8XblPtZw,942
+trenchfoot/scenarios/S02_straight_slope_pipe/metrics.json,sha256=g8qKCa5t5gGE3-P9PTjFUn-z2ka3lxyWoI_pGjfAc9Q,929
 trenchfoot/scenarios/S02_straight_slope_pipe/preview.png,sha256=Aj5XpJMSdRNqnrPzL4oe-d0RjLdFT2V7OFrrZxwlsx8,251134
 trenchfoot/scenarios/S02_straight_slope_pipe/preview_oblique.png,sha256=8gTOJkd63NtXRkHcS31Sun_ClXiufqsxFeTVrPcG1no,173774
 trenchfoot/scenarios/S02_straight_slope_pipe/preview_side.png,sha256=Zwft-WEogsjPGcaUl7-Xd4kRIjewlbJ9h52MjS0pXB4,56706
 trenchfoot/scenarios/S02_straight_slope_pipe/preview_top.png,sha256=Su71iVHxgWIVPaYde4qnMiBR_gXix1n9bCSgmiYkO6M,57538
 trenchfoot/scenarios/S02_straight_slope_pipe/scene.json,sha256=W1ApzLHEnHQn-7AdWxh2xiEinj6Yb7830sQXNxmmmDw,486
 trenchfoot/scenarios/S02_straight_slope_pipe/sdf_metadata.json,sha256=5zWHXErct6UJro-6PzkCJqENG8PNAABVHBIIPg5sJfE,1211
-trenchfoot/scenarios/S02_straight_slope_pipe/trench_scene.obj,sha256=omKinM35RiOV-Npmo6RqnoQw_Uj7wP-K0p13opSLpEw,333169
+trenchfoot/scenarios/S02_straight_slope_pipe/trench_scene.obj,sha256=2FPl5hrUiE3WSW1vI2kkzhPpEshsyInEawOM2Ayk1pw,340328
 trenchfoot/scenarios/S02_straight_slope_pipe/meshes/trench_scene_culled.obj,sha256=OOiw80NuCBejzeN3MWAip9Haw8yQsLZEdlMQdDIgEMU,847
 trenchfoot/scenarios/S02_straight_slope_pipe/point_clouds/culled/resolution0p050.pth,sha256=Ug9hTIsm6iQKRs9cucXJyJpxpSvQ5f2GS1ytZmxi1mE,1623389
 trenchfoot/scenarios/S02_straight_slope_pipe/point_clouds/full/resolution0p050.pth,sha256=JgIRni8xWKtz2mm0gpSdmavGe-FF71mDervavM4Rqw8,1718877
 trenchfoot/scenarios/S02_straight_slope_pipe/volumetric/trench_volume.msh,sha256=kNFAqjr7dM-KX4JQV1u5GbHbWWFIfiEur1wV1fJCePA,47084
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/ground_truth_isosurface.html,sha256=0kRp_SHowhOHCljQV7CYaI0ur1KOzUjjjIJSwMdMoOI,6791920
-trenchfoot/scenarios/S03_L_slope_two_pipes_box/metrics.json,sha256=d5fp32sI0QkbNjBJVMeRcD4cw6ZrB6QqrzSWMiRtH8Q,1111
+trenchfoot/scenarios/S03_L_slope_two_pipes_box/metrics.json,sha256=K1A8yiazMdnH4QBPIdrl88Uhaei8LdEz9P-RWKmYAi0,1124
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview.png,sha256=q0V_2HSLUl2ovWLc4INKV87aLVh3vzqabMyKr8XEWEg,224248
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_oblique.png,sha256=Nvp0hvmG9HvZgbiEgbbI3uJtCLNFgLdamh8p2dw3ucY,154869
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_side.png,sha256=57DnWIuV4p-7eguJVSshd0SZ0COy7Y2cedUMp_DrrjY,51284
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_top.png,sha256=rs-CMZwaNUl5xef85WEckQqm_UqNrGcfE39nofvsp0E,48235
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/scene.json,sha256=72g4wMT8tWcLRDYyMoJXOK50PbpfC1DDt6VUYGZgFzM,941
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/sdf_metadata.json,sha256=6ESVHVGuw_PJzIUD65bMoTLazbU8_a29zEUjmwaQYGo,1774
-trenchfoot/scenarios/S03_L_slope_two_pipes_box/trench_scene.obj,sha256=yKUkkqHSDMd0ywmUEP46TIfATmcRoeKDqH4x-nlkTVg,677447
+trenchfoot/scenarios/S03_L_slope_two_pipes_box/trench_scene.obj,sha256=YZvY0bhO5vjCb5seQb7-SG9SbgqdyMCCM6Og95heFaE,676874
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/meshes/trench_scene_culled.obj,sha256=At4lipowr_3MY1rxmcKa479F_mQ-jJDVQJe0yHTrFSc,1835
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/point_clouds/culled/resolution0p050.pth,sha256=KqbuoZ1tUPDhlnDgmhd-7WBb92TABsEmOzEsB__KtlA,2456029
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/point_clouds/full/resolution0p050.pth,sha256=4fXvfu0TMO9FJaoqYrW21SCGe3eKuSLkSUl9CdE14rw,2622685
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/volumetric/trench_volume.msh,sha256=cPgHKHlzPPtWX8H1yaxAYsEgYba3fr2JjfPvgg2a000,87383
 trenchfoot/scenarios/S04_U_slope_multi_noise/ground_truth_isosurface.html,sha256=E7sa8dlDyICJBlnL9X2C8IEopEJzDMhHdLbW-WpoPFc,7184880
-trenchfoot/scenarios/S04_U_slope_multi_noise/metrics.json,sha256=QVKiwzfcRRWjW2-d1XHkctvEes3G8OGA6vUmwLVX1gU,1293
+trenchfoot/scenarios/S04_U_slope_multi_noise/metrics.json,sha256=2o8LwqD4KKGwQC1oHs60i6aOP5nK2vOzLAVvGvQZ94w,1294
 trenchfoot/scenarios/S04_U_slope_multi_noise/preview.png,sha256=ZbLgrL0nRtUX1y77i7b3LCxw4w_j5Ivmmh0i2YzrBDs,238958
 trenchfoot/scenarios/S04_U_slope_multi_noise/preview_oblique.png,sha256=HKUWhUuuql2YZzqq4B5oDpQSCWy9RhuwY_JxVZ-bEbg,162693
 trenchfoot/scenarios/S04_U_slope_multi_noise/preview_side.png,sha256=S7n1ivuo1PFcMp_WuEEnJnCx2JMP5yiCCCYOFDzJtfY,77730
 trenchfoot/scenarios/S04_U_slope_multi_noise/preview_top.png,sha256=auLgGMvU1bRua43WrU-O2WelPy0TbPZZD7ALFIvqlqk,65419
 trenchfoot/scenarios/S04_U_slope_multi_noise/scene.json,sha256=jkUNZ_rHSjVajoj54o8KoeWzY3pFH97L5pdWiH_C75w,1119
 trenchfoot/scenarios/S04_U_slope_multi_noise/sdf_metadata.json,sha256=78CdQZwn01CBBfMr-4jUc3eOGNw9jxmWEmjwd7KvM6o,2234
-trenchfoot/scenarios/S04_U_slope_multi_noise/trench_scene.obj,sha256=ncMNawv9MeZBWbL24U7n4iqw_D5DAmP8zZ2I9rRyeQg,1211491
+trenchfoot/scenarios/S04_U_slope_multi_noise/trench_scene.obj,sha256=er_f18snk8TQcboKdmlH2kOMAffR6S0BpliETvQT5iQ,1212223
 trenchfoot/scenarios/S04_U_slope_multi_noise/meshes/trench_scene_culled.obj,sha256=ykw_tzhXknXt3DbmSk3cBzbOL91Jm4zxjthp799YkWw,3206
 trenchfoot/scenarios/S04_U_slope_multi_noise/volumetric/trench_volume.msh,sha256=7KfGkJAlv19rzbaPhzbmy9UWo42Db_4VhAtisn6aMak,144623
 trenchfoot/scenarios/S05_wide_slope_pair/ground_truth_isosurface.html,sha256=MVKZHfrF2emDTNmpn7AhxqYUlcBXDUzY7_qSek2RpWg,6304070
-trenchfoot/scenarios/S05_wide_slope_pair/metrics.json,sha256=9ksX7RfFS0krZmBG6K-qOEHAVLqs589Vmtcji34CroA,1111
+trenchfoot/scenarios/S05_wide_slope_pair/metrics.json,sha256=ejqAir1__oegf0jF_N6R3vyFfCjlzP-zF-qsulS4ln4,1109
 trenchfoot/scenarios/S05_wide_slope_pair/preview_oblique.png,sha256=S0MwfT2bC0T7AAUsqwDAIBxxRea6lHeYhQYrumwJfFU,139982
 trenchfoot/scenarios/S05_wide_slope_pair/preview_side.png,sha256=8hiJ5ZZZ6iqIdPakWsgWDPrJnEuU7Qqy-odjnR38ocM,67796
 trenchfoot/scenarios/S05_wide_slope_pair/preview_top.png,sha256=bDdjWwBN6QQfZ2kV71VbV_Q59nrPYAiUMh3ivRo4L9M,57737
 trenchfoot/scenarios/S05_wide_slope_pair/scene.json,sha256=jmNMzqR8m4DvR35325GH87FdYXRgVb5VuKu7ZwDovW0,1028
 trenchfoot/scenarios/S05_wide_slope_pair/sdf_metadata.json,sha256=PRaqys_akemKtlfTwhJBELx5erUHKarjHMgMvU5R4kc,1776
-trenchfoot/scenarios/S05_wide_slope_pair/trench_scene.obj,sha256=5LGCU4aPyHoDLzHXBFbOZlDSNMdZop2eVx6Xi2jI3Qs,694675
+trenchfoot/scenarios/S05_wide_slope_pair/trench_scene.obj,sha256=udbLJuiOVA9VyNvZbWwmuTdgyXKmu2a_sLTGJDp61o0,693480
 trenchfoot/scenarios/S05_wide_slope_pair/volumetric/trench_volume.msh,sha256=pHrj2dJgpSklpxiHHThiZINJQWpUdvkfhUnVBpKASEM,123235
 trenchfoot/scenarios/S06_bumpy_wide_loop/ground_truth_isosurface.html,sha256=_p4-B7sg_lfvKzVwJyfg6ub5Nk_x-ekzmLUE2NxQvkQ,6600554
 trenchfoot/scenarios/S06_bumpy_wide_loop/metrics.json,sha256=CH9ubdgvXhEBX6hi0Hme8B2jMX_HVHQGyqh5w8a-veE,1220
@@ -85,8 +85,8 @@ trenchfoot/scenarios/S07_circular_well/scene.json,sha256=tLLEgEWNxARpvHXkgLNDRvm
 trenchfoot/scenarios/S07_circular_well/sdf_metadata.json,sha256=5_D_rA_CqWgg2uSgVlqWCO4zQg0Gg5NWUnXHtCERBUA,4776
 trenchfoot/scenarios/S07_circular_well/trench_scene.obj,sha256=PHsRceUTwRAc44sppI2HnCeWkqUPafS-LcTe_50rP84,1608845
 trenchfoot/scenarios/S07_circular_well/volumetric/trench_volume.msh,sha256=dqhtd3SFKj5RLT_BcWIIvVGCbAqvOx7RX25-K7NKX10,615212
-trenchfoot-0.4.3.dist-info/METADATA,sha256=Q1uoSprpp1KPEqt9WJSY02JwabLR19v4oXtJjmK4C50,5292
-trenchfoot-0.4.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-trenchfoot-0.4.3.dist-info/entry_points.txt,sha256=5TejAGmc4GnNYLn7MhhLtSCNz9240RvzcNaetF4IHfg,119
-trenchfoot-0.4.3.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-trenchfoot-0.4.3.dist-info/RECORD,,
+trenchfoot-0.4.5.dist-info/METADATA,sha256=u8rwlE8sWWjnjx5bU84gZuN88ppNvzv4GZ9BKpqRJGE,5292
+trenchfoot-0.4.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+trenchfoot-0.4.5.dist-info/entry_points.txt,sha256=5TejAGmc4GnNYLn7MhhLtSCNz9240RvzcNaetF4IHfg,119
+trenchfoot-0.4.5.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+trenchfoot-0.4.5.dist-info/RECORD,,