eomsangdonandClaude Opus 5.5
c52a98a115
- build_detail auto — 없음 = 세류선 교차만 · all = 세류선 + 100 m 보충으로 다시 · add = 지금 목록 + 빈 구간 보충 · 후보는 늘 셈 - 배수유역 라우터 — 요청 auto 칸(틀리면 400) · 같은 자리(0.05 m) 관만 속성 · id · 사유 이어받음 · 나머지 새 관 = 등록부 기본값 · 저장본 열쇠에 auto - 노선 [저장] · 추천 [적용] — 오목 지점 보충 지움(응답 concave 칸 · 화면 한 줄 같이) - 시험 — test_369_drainage_auto 세 모드 · test_346_3 · 312 · 342_3 고쳐 씀 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VmC34fsxxbweEG3RUjs3Mn
118 lines
5.3 KiB
Python
118 lines
5.3 KiB
Python
"""369 배수 구조물 자리 — 기본 = 세류선 교차만 · [자동 제안] 두 방식(all · add).
|
|
|
|
- 기본(auto 없음) = 세류선 교차 관만 · 100 m 보충 없음 · 관 자리 후보는 셈.
|
|
- all = 세류선 + 100 m 보충으로 다시(지금 목록 무시) · 같은 자리(0.05 m) 관은 속성 · id 유지 ·
|
|
나머지 = 새 관(등록부 기본값).
|
|
- add = 지금 목록 그대로 + 빈 구간 보충 · 더한 관 = 새 관(등록부 기본값).
|
|
- 틀린 auto = 400 · 저장본 열쇠에 auto.
|
|
"""
|
|
|
|
import asyncio
|
|
from pathlib import Path
|
|
from uuid import uuid4
|
|
|
|
import numpy as np
|
|
|
|
from B04_PreProcess import B04_PreProcess_Router_Basins as basins
|
|
from B04_PreProcess.B04_PreProcess_Engine_Watershed_Grid import GridSpec
|
|
from common_util.common_util_drainage_context import DrainageContext
|
|
from common_util.common_util_drainage_detail import RoadRouting, build_detail
|
|
from common_util.common_util_drainage_pipes import PipePoint
|
|
from common_util.common_util_route_geometry import RouteVertex, StructureCandidate
|
|
|
|
VERTICES = [RouteVertex(0.0, 0.0, 100.0, 0.0), RouteVertex(300.0, 0.0, 90.0, 300.0)]
|
|
CONTEXT = DrainageContext(stored_path="x", project_root=Path("."), vertices=VERTICES)
|
|
|
|
|
|
def _routing() -> RoadRouting:
|
|
spec = GridSpec(x_min=-5.0, y_max=5.0, cell_m=1.0, n_rows=10, n_cols=310)
|
|
road_index = np.arange(5 * 310 + 5, 5 * 310 + 305, dtype=np.int32)
|
|
road_slot = np.full(spec.size, -1, dtype=np.int32)
|
|
road_slot[road_index] = np.arange(road_index.size)
|
|
return RoadRouting(
|
|
spec=spec,
|
|
road_slot=road_slot,
|
|
path_length=np.zeros(spec.size, np.float32),
|
|
elevation=np.full(spec.size, 95.0, np.float32),
|
|
road_cell_index=road_index,
|
|
road_chainage=np.arange(road_index.size, dtype=np.float64),
|
|
strength=np.ones(road_index.size, np.int64),
|
|
base_pipes=[StructureCandidate(chainage_m=150.0, x=150.0, y=0.0, reason="stream")],
|
|
)
|
|
|
|
|
|
def _detail(tmp_path, chainages=None, auto=None):
|
|
return build_detail(tmp_path / "없음", VERTICES, chainages, _routing(), [], auto)
|
|
|
|
|
|
def test_기본은_세류선_교차만(tmp_path):
|
|
detail = _detail(tmp_path)
|
|
assert [(p.chainage_m, p.reason) for p in detail.pipes] == [(150.0, "stream")]
|
|
assert len(detail.pipe_candidates) == 2 # 0~150 · 150~300 이 100 m 넘음 — 제안만
|
|
|
|
|
|
def test_all_은_세류선_더하기_100m_보충_지금_목록_무시(tmp_path):
|
|
detail = _detail(tmp_path, [10.0, 150.02], "all")
|
|
reasons = [p.reason for p in detail.pipes]
|
|
places = [p.chainage_m for p in detail.pipes]
|
|
assert reasons.count("stream") == 1 and reasons.count("spacing") == 2
|
|
assert 150.0 in places and 10.0 not in places
|
|
gaps = np.diff([0.0, *places, 300.0])
|
|
assert gaps.max() <= 100.0 and not detail.pipe_candidates
|
|
|
|
|
|
def test_add_는_지금_목록_더하기_빈_구간_보충(tmp_path):
|
|
detail = _detail(tmp_path, [20.0], "add")
|
|
places = [p.chainage_m for p in detail.pipes]
|
|
assert 20.0 in places and len(places) == 3 # 20 ~ 300 = 280 m → 보충 둘
|
|
assert np.diff([0.0, *places, 300.0]).max() <= 100.0
|
|
# auto 없음 = 목록 그대로(보충은 후보만)
|
|
plain = _detail(tmp_path, [20.0])
|
|
assert [p.chainage_m for p in plain.pipes] == [20.0] and len(plain.pipe_candidates) == 2
|
|
|
|
|
|
def _build(tmp_path, monkeypatch, points, auto):
|
|
monkeypatch.setattr(basins, "drainage_dir", lambda stored: tmp_path / "없음")
|
|
return basins._build("x", CONTEXT, points, _routing(), [], auto=auto)
|
|
|
|
|
|
def test_all_같은_자리_관은_속성_id_유지_새_관은_기본값(tmp_path, monkeypatch):
|
|
kept = PipePoint(
|
|
chainage_m=150.03,
|
|
source="user",
|
|
facility="ford_bridge",
|
|
options={"ford_width_m": 4.0},
|
|
id="keep",
|
|
)
|
|
gone = PipePoint(chainage_m=10.0, source="user", options={"pipe_diameter_mm": 600}, id="gone")
|
|
_, carried = _build(tmp_path, monkeypatch, [gone, kept], "all")
|
|
ford = [p for p in carried if p.id == "keep"]
|
|
assert len(ford) == 1 and ford[0].facility == "ford_bridge" and ford[0].source == "user"
|
|
assert all(p.id != "gone" for p in carried)
|
|
fresh = [p for p in carried if p.id != "keep"]
|
|
assert len(fresh) == 2 and all(p.source == "spacing" for p in fresh)
|
|
assert all((p.options or {}).get("pipe_diameter_mm") for p in fresh) # 등록부 관경
|
|
|
|
|
|
def test_add_더한_관은_기본값_지금_관은_그대로(tmp_path, monkeypatch):
|
|
mine = PipePoint(chainage_m=20.0, source="user", id="mine")
|
|
_, carried = _build(tmp_path, monkeypatch, [mine], "add")
|
|
assert [p.id for p in carried].count("mine") == 1
|
|
assert next(p for p in carried if p.id == "mine").options is None # 옛 빈칸 = 미확정 유지
|
|
added = [p for p in carried if p.id != "mine"]
|
|
assert len(added) == 2 and all(p.source == "spacing" for p in added)
|
|
assert all((p.options or {}).get("pipe_diameter_mm") for p in added)
|
|
|
|
|
|
def test_틀린_auto_는_400_열쇠에_auto(tmp_path, monkeypatch):
|
|
async def load(project_id):
|
|
return CONTEXT, ""
|
|
|
|
monkeypatch.setattr(basins, "load_drainage_context", load)
|
|
monkeypatch.setattr(basins, "drainage_dir", lambda stored: tmp_path)
|
|
result = asyncio.run(basins._resolve(uuid4(), {"auto": "spacing"}, use_stored=False))
|
|
assert result.status_code == 400
|
|
points = [PipePoint(chainage_m=20.0)]
|
|
keys = {basins._detail_key(CONTEXT, points, auto) for auto in basins.AUTO_MODES}
|
|
assert len(keys) == 3
|