From 1dfe6bfefb12adaf46d4c065299a0271dfafb5dd Mon Sep 17 00:00:00 2001 From: umsangdon Date: Thu, 1 Oct 2026 21:00:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix(m02-df):=20=EB=A7=8C=EB=82=98=EB=8A=94?= =?UTF-8?q?=20=EC=83=81=EC=9E=90=EB=8A=94=20=EC=82=B4=EC=95=84=20=EC=9E=88?= =?UTF-8?q?=EB=8A=94=20=EC=84=A0=EC=9D=B4=20=EC=9E=88=EC=9C=BC=EB=A9=B4=20?= =?UTF-8?q?=EC=85=88=20=E2=80=94=20=EC=84=9C=EB=B2=84=20=3D=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 받는 상자는 들어오는 선이 모두 쉬는 갈래일 때만 쉼 · 하나라도 살아 있으면 셈(쉬는 갈래 값은 빈 칸) · 쉬는 선은 쉼 줄만 - 조건 선 바로 뒤 상자는 그대로 막음 · M02_DF_Compute.py 도 같은 뜻(resting · arrive) - 시험: 지반 견본 토사 → 1㎥ 경비 2,000 · 암 → 브레이커 갈래 값 · 쉼 줄 · 문제 0 · 서버 = 화면(26개) Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01VBToTCGk5dqDKeXCEP3vhk --- M02_MasterTemplete/DataFlow/M02_DF_Compute.py | 37 ++++++++++++++-- M02_MasterTemplete/DataFlow/M02_DF_Eval.ts | 44 +++++++++++-------- resources/tester/test_m02_df_model.py | 37 ++++++++++++++++ 3 files changed, 96 insertions(+), 22 deletions(-) diff --git a/M02_MasterTemplete/DataFlow/M02_DF_Compute.py b/M02_MasterTemplete/DataFlow/M02_DF_Compute.py index d447e8eda..3abcdc73b 100644 --- a/M02_MasterTemplete/DataFlow/M02_DF_Compute.py +++ b/M02_MasterTemplete/DataFlow/M02_DF_Compute.py @@ -440,6 +440,9 @@ def _sheet_of(box: dict, arrived: dict, given: dict) -> dict: return sheet +REST = "앞 조건이 안 맞아 쉬는 갈래" + + def run(lg: dict, values: dict, load: Loader, local: list[dict], stack: list | None = None) -> dict: """셈 — {ports, outputs, cost, errors, breaks, filled}(filled = 받는 칸에 값만 되돌려 넣음).""" ctx = {"load": load, "local": local, "stack": stack or [lg.get("key") or ""]} @@ -448,6 +451,7 @@ def run(lg: dict, values: dict, load: Loader, local: list[dict], stack: list | N name = lambda i: boxes.get(i, {}).get("name") or i # noqa: E731 errors, breaks, ports, arrived, outputs = [], [], {}, {}, {} blocked: set[str] = set() + resting: set[str] = set() # 조건이 안 맞아 쉬는 상자 — Eval 과 같은 뜻 cost: dict[str, Any] = {**dict.fromkeys(COSTS, Decimal(0)), "값들": {}} def through(ln: dict) -> Any: @@ -464,13 +468,15 @@ def run(lg: dict, values: dict, load: Loader, local: list[dict], stack: list | N got, why = apply_rule(rule, v, conds) if why: blocked.add(ln["to"].get("box")) + if why == "통과 안 됨": + resting.add(ln["to"].get("box")) text = f"「{name(src.get('box'))}」 → 「{name(ln['to'].get('box'))}」 {why}" kind = "오류" if why in ("표에 여럿 맞음", "오류") else why to = ln["to"] breaks.append( { "kind": kind, - # 무게 — 통과 안 됨 = 쉼(조건이 안 맞아 쉬는 갈래) · 나머지 = 문제(Eval CfBreak.level 과 같음) + # 무게 — 통과 안 됨 = 쉼 · 나머지 = 문제(Eval CfBreak.level 과 같음) "level": "쉼" if kind == "통과 안 됨" else "문제", "box": to.get("box"), "port": to.get("name"), @@ -483,9 +489,32 @@ def run(lg: dict, values: dict, load: Loader, local: list[dict], stack: list | N return None if why else got def arrive(box: dict) -> dict: - got = { - ln["to"].get("name"): through(ln) for ln in links if ln["to"].get("box") == box["id"] - } + """받는 값 — 쉬는 갈래 빈 값은 「쉼」 줄만 · 선이 모두 쉬면 상자도 쉼(Eval 과 같음).""" + ins = [ln for ln in links if ln["to"].get("box") == box["id"]] + got, rest = {}, 0 + for ln in ins: + src, to = ln.get("from") or {}, ln["to"] + if ( + src.get("box") in resting + and ports.get(src.get("box"), {}).get(src.get("name")) is None + ): + rest += 1 + got[to.get("name")] = None + breaks.append( + { + "kind": "통과 안 됨", + "level": "쉼", + "box": to.get("box"), + "port": to.get("name"), + "link": ln.get("id"), + "text": f"「{name(src.get('box'))}」 → 「{name(to.get('box'))}」 — {REST}", + } + ) + continue + got[to.get("name")] = through(ln) + if ins and rest == len(ins): + resting.add(box["id"]) + blocked.add(box["id"]) arrived[box["id"]] = got return got diff --git a/M02_MasterTemplete/DataFlow/M02_DF_Eval.ts b/M02_MasterTemplete/DataFlow/M02_DF_Eval.ts index aba6e5f26..a35d22cf9 100644 --- a/M02_MasterTemplete/DataFlow/M02_DF_Eval.ts +++ b/M02_MasterTemplete/DataFlow/M02_DF_Eval.ts @@ -263,21 +263,6 @@ export function evalLogic( /** 선 하나로 들어오는 값 — 규칙이 있으면 엔진으로 */ const through = (l: CfLink): CfValue => { const v = valueOf(l.from.box, l.from.name); - // 쉬는 갈래에서 온 빈 값 — 받는 상자도 쉼(셈하지 않음 · 문제로 안 셈) - if (v === null && resting.has(l.from.box)) { - resting.add(l.to.box); - blocked.add(l.to.box); - const text = tl("Rest", { from: name(l.from.box), box: name(l.to.box) }); - found.push({ - kind: "통과 안 됨", - level: "쉼", - box: l.to.box, - port: l.to.name, - link: l.id, - text, - }); - return null; - } if (!l.rule) return v; if (v === null && (l.rule.kind === "scale" || l.rule.kind === "round")) return null; const conds = Object.fromEntries( @@ -311,10 +296,33 @@ export function evalLogic( if (res.why) blocked.add(l.to.box); return res.why ? null : res.value; }; + /** 받는 값 — 쉬는 갈래에서 온 빈 값은 「쉼」 줄만 남김 · 들어오는 선이 모두 쉬는 갈래면 받는 상자도 쉼 + * (하나라도 살아 있으면 셈 · 쉬는 갈래 값은 빈 칸) · 조건 선 바로 뒤 상자는 through 가 막음 */ const arrive = (box: CfBox): Record => { - const got = Object.fromEntries( - lg.links.filter((l) => l.to.box === box.id).map((l) => [l.to.name, through(l)]), - ); + const ins = lg.links.filter((l) => l.to.box === box.id); + const got: Record = {}; + let rest = 0; + for (const l of ins) { + if (resting.has(l.from.box) && valueOf(l.from.box, l.from.name) === null) { + rest++; + got[l.to.name] = null; + const text = tl("Rest", { from: name(l.from.box), box: name(l.to.box) }); + found.push({ + kind: "통과 안 됨", + level: "쉼", + box: l.to.box, + port: l.to.name, + link: l.id, + text, + }); + continue; + } + got[l.to.name] = through(l); + } + if (ins.length && rest === ins.length) { + resting.add(box.id); + blocked.add(box.id); + } arrived[box.id] = got; return got; }; diff --git a/resources/tester/test_m02_df_model.py b/resources/tester/test_m02_df_model.py index fe429974c..4cfbee4d8 100644 --- a/resources/tester/test_m02_df_model.py +++ b/resources/tester/test_m02_df_model.py @@ -643,3 +643,40 @@ def test_쉬는_갈래와_문제_무게() -> None: # 하나도 안 맞음 · 표에 없는 조건만 문제 — 쉬는 갈래 넷은 문제로 안 셈 assert b_problems == ["표에 없는 조건", "조건 안 맞음"] assert outs["b7"] is None # 쉬는 갈래 끝 출력은 빈 값(0 아님) + + +def _ground() -> dict: + return json.loads((CF / "_sample" / "ground.json").read_text(encoding="utf-8")) + + +def _server(lg: dict, values: dict) -> dict: + from M02_MasterTemplete.DataFlow import M02_DF_Compute as cp + + return cp.run(lg, values, lambda key: {}, []) + + +def test_만나는_상자는_살아_있는_선이_있으면_셈_서버와_같음() -> None: + lg = _ground() + soil = {"in-ground": {"지반": "토사"}} + rock = {"in-ground": {"지반": "암"}} + got = _run( + f"const lg = {json.dumps(lg, ensure_ascii=False)};\n" + f"const s = E.evalLogic(lg, {json.dumps(soil, ensure_ascii=False)});\n" + f"const r = E.evalLogic(lg, {json.dumps(rock, ensure_ascii=False)});\n" + "out([s.outputs, s.breaks.map(b => [b.kind, b.level, b.link]), r.outputs, r.breaks.map(b => [b.kind, b.level, b.link])," + " s.ports['fn-sum'], r.ports['fn-sum']]);" + ) + s_out, s_breaks, r_out, r_breaks, s_sum, r_sum = got + assert s_out == {"out-exp": 2000} # 굴삭기 갈래만 · 브레이커 갈래는 쉼(빈 칸) + assert s_breaks == [["통과 안 됨", "쉼", "l2"], ["통과 안 됨", "쉼", "l6"]] + assert [b for b in s_breaks if b[1] == "문제"] == [] + assert r_breaks == [["통과 안 됨", "쉼", "l1"], ["통과 안 됨", "쉼", "l5"]] + assert r_out["out-exp"] == r_sum["1㎥ 경비"] and r_out["out-exp"] != 2000 # 브레이커 갈래 값 + assert s_sum == {"1㎥ 경비": 2000} + # 서버(Compute) = 화면(Eval) + for values, screen_out, screen_breaks in ((soil, s_out, s_breaks), (rock, r_out, r_breaks)): + srv = _server(lg, values) + assert {k: float(v) for k, v in srv["outputs"].items()} == { + k: float(v) for k, v in screen_out.items() + } + assert [[b["kind"], b["level"], b["link"]] for b in srv["breaks"]] == screen_breaks From 9052cb7411357ca696e307168eb21e038d4dabd4 Mon Sep 17 00:00:00 2001 From: umsangdon Date: Thu, 1 Oct 2026 21:02:21 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix(M02):=20=ED=9D=90=EB=A6=84=EB=8F=84=20?= =?UTF-8?q?=EA=B8=B0=EB=8C=90=20=EC=84=A0=20=EB=81=9D=EC=9D=84=20=EC=95=8C?= =?UTF-8?q?=EC=95=BD=20=C2=B7=20=EC=9D=B4=EB=A6=84=ED=91=9C=EC=97=90=20?= =?UTF-8?q?=EB=B6=99=EC=9E=84=20=E2=80=94=20=EC=8B=9C=EC=9E=91=20=3D=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=95=8C=EC=95=BD=20=EC=98=A4=EB=A5=B8?= =?UTF-8?q?=EC=AA=BD=20=C2=B7=20=EB=81=9D=20=3D=20=EA=B7=9C=EC=B9=99=20?= =?UTF-8?q?=EC=84=A0=20=EC=9D=B4=EB=A6=84=ED=91=9C=20=EA=B0=80=EC=9E=A5?= =?UTF-8?q?=EC=9E=90=EB=A6=AC=20=EB=98=90=EB=8A=94=20=EC=9E=AC=EB=A3=8C=20?= =?UTF-8?q?=EC=95=8C=EC=95=BD=20=EC=98=A4=EB=A5=B8=EC=AA=BD(PLAN=2035-9=20?= =?UTF-8?q?=EB=B8=8C=EB=A0=88=EC=9D=B8=20=EC=9E=AC=EA=B2=80=EC=A6=9D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 시작에 작은 점 · 끝에 화살 · 끝 계산 depEnd · depPath(Parts) - 시험 test_m02_df_diagram_parts.py 5 통과 · DataFlow 전부 검사 초록 · Diagram 697줄 Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Ly2oHAaTDYRjcniAmHR81z --- M02_MasterTemplete/DataFlow/M02_DF_Diagram.ts | 40 +++++++++++++------ .../DataFlow/M02_DF_Diagram_Parts.ts | 19 +++++++++ resources/tester/test_m02_df_diagram_parts.py | 21 ++++++++++ 3 files changed, 68 insertions(+), 12 deletions(-) diff --git a/M02_MasterTemplete/DataFlow/M02_DF_Diagram.ts b/M02_MasterTemplete/DataFlow/M02_DF_Diagram.ts index f67ab35cd..b385ae6d7 100644 --- a/M02_MasterTemplete/DataFlow/M02_DF_Diagram.ts +++ b/M02_MasterTemplete/DataFlow/M02_DF_Diagram.ts @@ -14,7 +14,9 @@ import { clampZoom, fitView, KIND_COLOR, + depEnd, depInTrace, + depPath, follow, depLines, isRest, @@ -483,7 +485,7 @@ export function renderDiagram( parent.append(n); return n; }; - const label = (parent: Element, x: number, y: number, text: string, cls: string): void => { + const label = (parent: Element, x: number, y: number, text: string, cls: string): number => { const tag = add(parent, "g", { class: cls }); const box = add(tag, "rect", { rx: "4", ry: "4" }); const t = add(tag, "text", { @@ -497,6 +499,7 @@ export function renderDiagram( Object.entries({ x: x - w / 2, y: y - 9, width: w, height: 18 }).forEach(([k, v]) => box.setAttribute(k, v.toFixed(1)), ); + return w; }; const defs = add(svg, "defs", {}); const arrow = add(defs, "marker", { @@ -509,7 +512,16 @@ export function renderDiagram( orient: "auto", }); add(arrow, "path", { d: "M0,0 L8,4 L0,8 z", class: "m02-dfdg__arrow" }); - const mids = new Map(); + const dot = add(defs, "marker", { + id: "m02-dfdg-dot", + viewBox: "0 0 8 8", + refX: "4", + refY: "4", + markerWidth: "6", + markerHeight: "6", + }); + add(dot, "circle", { cx: "4", cy: "4", r: "3", class: "m02-dfdg__arrow" }); + const mids = new Map(); for (const l of lg.links) { const a = at(l.from, "out"); const b = at(l.to, "in"); @@ -531,9 +543,8 @@ export function renderDiagram( add(g, "path", { d, class: "m02-dfdg__hit" }); add(g, "path", { d, class: "m02-dfdg__wire" }); const mid = midOf(a, b); - mids.set(l.id, mid); const rule = labels[l.id] ?? linkLabel(l); - if (rule) label(g, mid.x, mid.y, rule, "m02-dfdg__rule"); + mids.set(l.id, { ...mid, w: rule ? label(g, mid.x, mid.y, rule, "m02-dfdg__rule") : 0 }); if (rest) label(g, mid.x, mid.y + (rule ? 18 : 0), tt("Rest"), "m02-dfdg__restmark"); const broken = breaks.filter((k) => k.link === l.id); const why = [...broken, ...rests.filter((k) => k.link === l.id)] @@ -559,14 +570,14 @@ export function renderDiagram( } // 기댐 선 — 규칙이 기대는 알약 → 그 규칙이 있는 곳 · 흐린 점선 · 화살 for (const dep of depLines(lg)) { + // 시작 = 조건 알약 오른쪽 · 끝 = 그 규칙 선의 이름표 가장자리 또는 받는 재료 알약 오른쪽 const a = at(dep.from, "out"); - const b = - "link" in dep.to - ? mids.get(dep.to.link) - : at({ box: dep.to.box, name: dep.to.port }, "out", "far"); - if (!a || !b) continue; - const dx = Math.max(40, Math.abs(b.x - a.x) / 2); - const d = `M${a.x},${a.y} C${a.x + dx},${a.y} ${b.x - dx},${b.y} ${b.x},${b.y}`; + const tag = "link" in dep.to ? mids.get(dep.to.link) : null; + const pill = "box" in dep.to ? at({ box: dep.to.box, name: dep.to.port }, "out") : null; + const end = tag ? depEnd(a, tag) : pill && { ...pill, side: "right" as const }; + if (!a || !end) continue; + const b = { x: end.x, y: end.y }; + const d = depPath(a, b, end.side); const where = "link" in dep.to ? dep.to.link : dep.to.box; const steps = opts.trace; const traced = @@ -583,7 +594,12 @@ export function renderDiagram( "data-ends": [a.x, a.y, b.x, b.y].map((n) => n.toFixed(1)).join(","), }); add(g, "path", { d, class: "m02-dfdg__hit" }); - add(g, "path", { d, class: "m02-dfdg__depwire", "marker-end": "url(#m02-dfdg-arrow)" }); + add(g, "path", { + d, + class: "m02-dfdg__depwire", + "marker-start": "url(#m02-dfdg-dot)", + "marker-end": "url(#m02-dfdg-arrow)", + }); const m = midOf(a, b); label(g, m.x, m.y, dep.text, "m02-dfdg__deptext"); g.addEventListener("click", (ev) => { diff --git a/M02_MasterTemplete/DataFlow/M02_DF_Diagram_Parts.ts b/M02_MasterTemplete/DataFlow/M02_DF_Diagram_Parts.ts index 6c03d9b21..5181c80ed 100644 --- a/M02_MasterTemplete/DataFlow/M02_DF_Diagram_Parts.ts +++ b/M02_MasterTemplete/DataFlow/M02_DF_Diagram_Parts.ts @@ -284,6 +284,25 @@ export function depInTrace(dep: DepLine, steps: CfStep[]): boolean { return src && dst; } +type Pt = { x: number; y: number }; + +/** 이름표에 닿는 끝 — 시작이 왼쪽이면 이름표 왼쪽 가장자리 · 오른쪽이면 오른쪽 가장자리(이름표가 없으면 선 가운데) */ +export function depEnd(a: Pt | null, tag: Pt & { w: number }): Pt & { side: "left" | "right" } { + const fromLeft = !a || a.x <= tag.x; + return { + x: tag.x + (fromLeft ? -1 : 1) * (tag.w / 2 + 2), + y: tag.y, + side: fromLeft ? "left" : "right", + }; +} + +/** 기댐 선 길 — 알약 오른쪽에서 나가 끝에 닿음 · side = 끝으로 들어가는 쪽(재료 알약은 오른쪽에서) */ +export function depPath(a: Pt, b: Pt, side: "left" | "right"): string { + const dx = Math.max(40, Math.abs(b.x - a.x) / 2); + const bx = side === "left" ? b.x - dx : b.x + dx; + return `M${a.x},${a.y} C${a.x + dx},${a.y} ${bx},${b.y} ${b.x},${b.y}`; +} + /** 끊긴 곳 갈래 — 쉼(조건이 안 맞아 이번엔 안 지나감 · 문제 아님) · 문제 — Eval 의 level 그대로 */ export const isRest = (k: CfBreak): boolean => k.level === "쉼"; diff --git a/resources/tester/test_m02_df_diagram_parts.py b/resources/tester/test_m02_df_diagram_parts.py index ef01ab2f1..8f2cf9eae 100644 --- a/resources/tester/test_m02_df_diagram_parts.py +++ b/resources/tester/test_m02_df_diagram_parts.py @@ -45,6 +45,8 @@ const out = jobs.map((job) => { if (job.op === "rest") return job.breaks.map((b) => m.isRest(b)); if (job.op === "fit") return m.fitView(job.rects, job.view); if (job.op === "value") return job.values.map((v) => m.showValue(v)); + if (job.op === "end") return m.depEnd(job.a, job.tag); + if (job.op === "path") return m.depPath(job.a, job.b, job.side); return null; }); process.stdout.write(JSON.stringify(out)); @@ -248,3 +250,22 @@ def test_한눈에_90_아래로_안_내림과_알약_값(): ) assert fit["zoom"] == 0.9 assert values == ["97,882.512", "268,908", "0.364", "깬돌", "· 2줄"] + + +def test_기댐_선_끝이_알약과_이름표에_붙음(): + left, right, path_left, path_right = run( + [ + {"op": "end", "a": {"x": 100, "y": 50}, "tag": {"x": 400, "y": 120, "w": 80}}, + {"op": "end", "a": {"x": 600, "y": 50}, "tag": {"x": 400, "y": 120, "w": 80}}, + {"op": "path", "a": {"x": 100, "y": 50}, "b": {"x": 358, "y": 120}, "side": "left"}, + {"op": "path", "a": {"x": 100, "y": 50}, "b": {"x": 130, "y": 300}, "side": "right"}, + ] + ) + # 시작이 왼쪽이면 이름표 왼쪽 가장자리(400 − 40 − 2) · 오른쪽이면 오른쪽 가장자리 + assert left == {"x": 358, "y": 120, "side": "left"} + assert right == {"x": 442, "y": 120, "side": "right"} + # 길은 시작 알약에서 나가 끝에서 끝남 · 재료 알약은 오른쪽에서 들어감(끝 손잡이가 끝보다 오른쪽) + assert path_left.startswith("M100,50 ") and path_left.endswith(" 358,120") + assert path_right.startswith("M100,50 ") and path_right.endswith(" 130,300") + handle = float(path_right.split(" ")[2].split(",")[0]) + assert handle > 130