@mytec: iter2.4.2 start
This commit is contained in:
@@ -21,6 +21,45 @@ class RayPath:
|
||||
is_valid: bool # Does this path exist?
|
||||
|
||||
|
||||
MAX_BUILDINGS_FOR_LINE = 100
|
||||
MAX_BUILDINGS_FOR_REFLECTION = 100
|
||||
MAX_DISTANCE_FROM_PATH = 500 # meters
|
||||
|
||||
|
||||
def _filter_buildings_by_distance(buildings, tx_point, rx_point, max_count=100, max_distance=500):
|
||||
"""Filter buildings to only those close to the TX-RX path.
|
||||
|
||||
Sort by distance to path midpoint, filter by max_distance, take top max_count.
|
||||
Uses squared Euclidean distance (no sqrt) for speed.
|
||||
"""
|
||||
if len(buildings) <= max_count:
|
||||
return buildings
|
||||
|
||||
mid_lat = (tx_point[0] + rx_point[0]) / 2
|
||||
mid_lon = (tx_point[1] + rx_point[1]) / 2
|
||||
|
||||
max_dist_sq = max_distance * max_distance
|
||||
|
||||
def dist_sq_to_midpoint(building):
|
||||
# Building centroid from geometry or fallback to midpoint
|
||||
geom = building.geometry
|
||||
if geom:
|
||||
blat = sum(p[1] for p in geom) / len(geom)
|
||||
blon = sum(p[0] for p in geom) / len(geom)
|
||||
else:
|
||||
blat, blon = mid_lat, mid_lon
|
||||
dlat = (blat - mid_lat) * 111000
|
||||
dlon = (blon - mid_lon) * 111000 * 0.7 # rough cos correction
|
||||
return dlat * dlat + dlon * dlon
|
||||
|
||||
scored = [(b, dist_sq_to_midpoint(b)) for b in buildings]
|
||||
scored.sort(key=lambda x: x[1])
|
||||
|
||||
# Filter by max distance and take top N
|
||||
filtered = [b for b, d in scored if d <= max_dist_sq]
|
||||
return filtered[:max_count]
|
||||
|
||||
|
||||
class DominantPathService:
|
||||
"""
|
||||
Find dominant propagation paths (2-3 strongest)
|
||||
@@ -420,6 +459,15 @@ class DominantPathService:
|
||||
else:
|
||||
line_buildings = buildings
|
||||
|
||||
# Filter to limit building count — prevents 600+ buildings per point
|
||||
original_line_count = len(line_buildings)
|
||||
line_buildings = _filter_buildings_by_distance(
|
||||
line_buildings,
|
||||
(tx_lat, tx_lon), (rx_lat, rx_lon),
|
||||
max_count=MAX_BUILDINGS_FOR_LINE,
|
||||
max_distance=MAX_DISTANCE_FROM_PATH,
|
||||
)
|
||||
|
||||
direct = self._check_direct_path_sync(
|
||||
tx_lat, tx_lon, tx_height,
|
||||
rx_lat, rx_lon, rx_height,
|
||||
@@ -442,13 +490,22 @@ class DominantPathService:
|
||||
else:
|
||||
reflection_buildings = buildings
|
||||
|
||||
# Filter reflection buildings to limit count
|
||||
original_refl_count = len(reflection_buildings)
|
||||
reflection_buildings = _filter_buildings_by_distance(
|
||||
reflection_buildings,
|
||||
(tx_lat, tx_lon), (rx_lat, rx_lon),
|
||||
max_count=MAX_BUILDINGS_FOR_REFLECTION,
|
||||
max_distance=MAX_DISTANCE_FROM_PATH,
|
||||
)
|
||||
|
||||
# Log building counts for first 3 points so user can verify filtering
|
||||
DominantPathService._log_count += 1
|
||||
if DominantPathService._log_count <= 3:
|
||||
import sys
|
||||
msg = (f"[DOMINANT_PATH] Point #{DominantPathService._log_count}: "
|
||||
f"line_bldgs={len(line_buildings)}, "
|
||||
f"refl_bldgs={len(reflection_buildings)}, "
|
||||
f"line_bldgs={len(line_buildings)} (from {original_line_count}), "
|
||||
f"refl_bldgs={len(reflection_buildings)} (from {original_refl_count}), "
|
||||
f"total_available={len(buildings)}, "
|
||||
f"spatial_idx={'YES' if spatial_idx else 'NO'}, "
|
||||
f"early_exit={'YES' if direct and direct.is_valid and not direct.materials_crossed else 'NO'}")
|
||||
|
||||
Reference in New Issue
Block a user