test(855-E 2-E4 ㉮-2): 옛 엔진 셈 단언을 문서 셈으로 — 782 셋 · 712_1 · 753_1

- helper_855_engine.calc(키, 입력) = 문서 셈 한 번(옛 master_formula.run(whole, 키, 입력) 자리 · 입력 이름 = 문서 변수 열쇠)
- test_782_1 · 782_2 · 782_3: mf.run → h.calc 같은 단언(실무 엑셀 Q 재현 41 통과) · 중간 값 = 문서 값 칸(k_환산 · T_작업 · n) · 원문 「-」 빈칸 = 못 셈 까닭(줄이 없음) · check_master 로직 검사 줄은 그대로(sub7 몫)
- test_712_1: 기계경비 판별 = 문서 전수 · 문서 셈 줄 비목(기계 줄 세 몫 · 계 = 비목 합) · 옛 묶음 꼬리표(master_bundle.bundle · 줄 묶음 인력 · 재료 · 하위) 시험 둘 지움 — 옛 엔진 안 셈
- test_753_1: 옵션꺼짐 표시 = 문서 금액 줄 꺼짐(master_doc_text.money_lines) · 계산서 sheet_groups 옵션꺼짐 · 진짜 0 · 문턱 기계 짝 · 옛 master_gate.tag 바꿔치기 금액 시험 지움(옛 엔진 속)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-18 14:03:57 +09:00
co-authored by Claude Opus 5.5
parent f6c9008550
commit 120e47570e
6 changed files with 82 additions and 126 deletions
+6
View File
@@ -50,6 +50,12 @@ def new_run(doc: dict, changed: dict | None):
return got if got.get("셈됨") else None
def calc(key: str, given: dict | None = None) -> dict:
"""문서 셈 한 번 — 옛 `master_formula.run(whole, 키, 입력)` 자리(입력 이름 = 문서 변수 열쇠) ·
못 셈 = 예외 그대로."""
return mc.calc(world()[1][key], world()[2], given or None)
def _d(v):
try:
return Decimal(str(v))
+19 -39
View File
@@ -1,4 +1,7 @@
"""712-1 지킴 — 인력 · 재료 · 경비 묶음 셈 때 파생 · 기계경비 판별 한 곳(`master_bundle`)."""
"""712-1 지킴 — 기계경비 판별 한 곳(`master_bundle.is_machine`) · 문서 셈 줄 비목.
옛 엔진 묶음 꼬리표(`master_bundle.bundle` · 줄 `묶음` 인력 · 재료 · 하위)는 855-E 2-E4 에서
은퇴."""
from __future__ import annotations
@@ -10,51 +13,28 @@ ROOT = Path(__file__).resolve().parents[2]
sys.path.insert(0, str(ROOT / "resources/master_data/scripts"))
sys.path.insert(0, str(ROOT))
import check_master as cm # noqa: E402
import master_auto as mau # noqa: E402
import helper_855_engine as h # noqa: E402
import master_base as mbase # noqa: E402
import master_bundle as mb # noqa: E402
import master_formula as mf # noqa: E402
FILES = cm.load()
MASTER = mf.Master(FILES)
LOGICS = {r["키"]: r for d in FILES.values() if d.get("그룹") == "로직" for r in d.get("줄") or []}
def test_every_line_bundled():
"""호표 · 덧줄 전수 — 하위(못 가름) ≤ 31 · 나머지는 인력 · 재료 · 경비 · 기계경비 줄 = 경비."""
count = dict.fromkeys(mb.BUNDLES, 0)
machine = 0
for row in LOGICS.values():
for item in [*row.get("호표", []), *row.get("덧줄", [])]:
name, is_mach = mb.bundle(MASTER, item)
count[name] += 1
machine += is_mach
if is_mach:
assert name == "경비"
assert sum(count.values()) > 5_000
assert count["하위"] <= 31, count
assert machine >= 1_000, machine
def test_machine_rule_one_place():
"""기계경비 = 결과단위 원/시간 돈 로직 — 작업량(㎥/시간) · 이름 「시간당」 은 아님."""
machines = {k for k, r in LOGICS.items() if mb.is_machine(r)}
"""기계경비 = 결과단위 원/시간 돈 문서 — 작업량(㎥/시간) · 이름 「시간당」 은 아님."""
docs = h.world()[1]
machines = {k for k, d in docs.items() if mb.is_machine(d)}
assert {"GC000267", "GC000268", "GF000145"} <= machines
assert not machines & {"GF000102", "GC000422", "GC000260"} # 작업량 · ㎡/시간 · 원/㎡
def test_run_lines_tagged():
"""엔진 `run` 줄마다 `묶음` · 기계경비 줄은 `장비` + 비목 노 · 재 · 경 세 몫."""
seen = set()
def test_run_lines_costs():
"""문서 셈 줄마다 비목 = 노 · 재 · 경 안 · 기계 부름 줄은 세 몫 · 계 = 비목 합 ·
줄 비목 합 - 계 = 비목 끝수 버림 몫(비목 하나에 1 원 안)."""
for key in ("GF000169", "GF000103"):
row = LOGICS[key]
given = {k: v for k, v in mau.values(MASTER, row).items() if v is not None}
got = mf.run(MASTER, key, given)
got = h.calc(key)
for line in got["줄"]:
assert line["묶음"] in mb.BUNDLES
seen.add(line["묶음"])
if line.get("장비"):
assert set(line["비목"]) == set(mf.COST_ITEMS)
total = sum((line["비목"].get(k) or Decimal(0)) for line in got["줄"] for k in line["비목"])
assert abs(total - got["계"]) < 1
assert {"인력", "재료", "하위"} <= seen
assert set(line["비목"]) <= set(mbase.COST_ITEMS)
parts = [v or Decimal(0) for line in got["줄"] for v in line["비목"].values()]
assert got["계"] == sum(got[k] for k in mbase.COST_ITEMS)
assert 0 <= sum(parts) - got["계"] < len(parts)
machine = next(ln for ln in h.calc("GF000103")["줄"] if ln["이름"].startswith("굴착기"))
assert set(machine["비목"]) == set(mbase.COST_ITEMS)
+35 -63
View File
@@ -1,21 +1,16 @@
"""옵션으로 빠진 줄 표시(PLAN 753-1 · 요구 588-4) — 엔진 줄 덧칸 `옵션꺼짐`.
"""옵션으로 빠진 줄 표시(PLAN 753-1 · 요구 588-4) — 금액 줄 `꺼짐` · 계산서 줄 `옵션꺼짐`.
M01 셈(`/calc`) · 계산서(`/text` · `master_sheet_line.annotate`) · SK 셈(`M02_Sangeun_Calc.run`)이
같은 엔진 줄을 씀 · 금액 그대로 · 진짜 0(입력 0 · 표 칸 0)은 표시 없음.
문서 셈 금액 줄(`master_doc_text.money_lines`) · 공용 계산서 묶음(`sheet_groups`)이 같은 판정 ·
진짜 0(입력 0 · 표 칸 0)은 표시 없음. 옛 엔진 덧칸(`master_gate` · `master_sheet_line`)은
855-E 2-E4 에서 은퇴.
"""
import sys
from pathlib import Path
import importlib
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "master_data/scripts"))
import check_master as cm # noqa: E402
import master_formula as mf # noqa: E402
import master_gate as mg # noqa: E402
import master_sheet_line as msl # noqa: E402
import master_text as mtx # noqa: E402
import pytest # noqa: E402
import helper_855_engine as h
import pytest
mdt = importlib.import_module("master_doc_text")
FORM = "GC000211" # 6-3-1 합판거푸집 — 폼타이 12.7 · 9.5 · 7.9 규격마다 줄
TIES = ("폼타이 12.7㎜", "폼타이 9.5㎜", "폼타이 7.9㎜")
@@ -26,68 +21,45 @@ CASES = [
]
@pytest.fixture(scope="module")
def master():
files = cm.load()
return files, mf.Master(files)
def _given(whole, key, **over):
return {**cm.시험입력(whole.logic(key)), **over}
def _lines(key, over=None):
return mdt.money_lines(h.world()[1][key], h.calc(key, over), h.world()[2])
@pytest.mark.parametrize("over,off", CASES)
def test_engine_marks_unpicked_ties(master, over, off):
_, whole = master
got = mf.run(whole, FORM, _given(whole, FORM, **over))
marked = {x["이름"] for x in got["줄"] if x.get(mg.KEY)}
def test_engine_marks_unpicked_ties(over, off):
marked = {x["이름"] for x in _lines(FORM, over) if x.get("꺼짐")}
assert marked == off
def test_real_zero_not_marked(master):
_, whole = master
got = mf.run(whole, FORM, _given(whole, FORM, 구멍땜=0))
holes = [x for x in got["줄"] if "구멍땜" in x["이름"]]
assert holes and all(x["수량"] == 0 and not x.get(mg.KEY) for x in holes)
def test_real_zero_not_marked():
holes = [x for x in _lines(FORM, {"구멍땜": 0}) if "구멍땜" in x["이름"]]
assert holes and all(x["수량"] == 0 and not x.get("꺼짐") for x in holes)
# 조건이 참이고 표 칸이 0 인 줄(GC000480 측량초급기능사) — 진짜 0
got = mf.run(whole, "GC000480", cm.시험입력(whole.logic("GC000480")))
line = got["줄"][3]
assert line["수량"] == 0 and not line.get(mg.KEY)
line = _lines("GC000480")[3]
assert line["수량"] == 0 and not line.get("꺼짐")
def test_numeric_threshold_marks_other_machine(master):
_, whole = master
got = mf.run(whole, "GC000187", cm.시험입력(whole.logic("GC000187")))
pairs = [(got["줄"][n], got["줄"][n + 1]) for n in (3, 5, 7)]
def test_numeric_threshold_marks_other_machine():
got = _lines("GC000187") # 기계 줄 = 비목마다 한 줄씩
pairs = [
("다짐말뚝 전용장비 100ton", "다짐말뚝 전용장비 120ton"),
("진동파일해머 90㎾", "진동파일해머 120㎾"),
("공기압축기 17.0㎥", "공기압축기 21.0㎥"),
]
for a, b in pairs: # 타설길이 문턱으로 둘 중 하나 — 0 인 쪽만 표시
assert {bool(a.get(mg.KEY)), bool(b.get(mg.KEY))} == {True, False}
assert all(bool(x.get(mg.KEY)) == (x["수량"] == 0) for x in (a, b))
marks = {n: {bool(x["꺼짐"]) for x in got if x["이름"] == n} for n in (a, b)}
assert sorted(marks.values(), key=str) == [{False}, {True}]
assert all(bool(x["꺼짐"]) == (x["수량"] == 0) for x in got if x["이름"] in (a, b))
def test_money_same_without_mark(master, monkeypatch):
_, whole = master
for over, _ in CASES:
given = _given(whole, FORM, **over)
on = mf.run(whole, FORM, given)
with monkeypatch.context() as m:
m.setattr(mg, "tag", lambda *a: a[2])
off = mf.run(whole, FORM, given)
assert on["계"] == off["계"]
assert [x["금액"] for x in on["줄"]] == [x["금액"] for x in off["줄"]]
def test_never_marks_nonzero(master):
_, whole = master
def test_never_marks_nonzero():
for key in ("GC000211", "GC000002", "GC000216", "GC000563", "GC000187"):
got = mf.run(whole, key, cm.시험입력(whole.logic(key)))
assert all(x["수량"] == 0 for x in got["줄"] if x.get(mg.KEY))
assert all(x["수량"] == 0 for x in _lines(key) if x.get("꺼짐"))
def test_sheet_text_carries_mark(master):
files, whole = master
given = _given(whole, FORM, 폼타이="사용", 폼타이규격="9.5㎜")
got = msl.annotate(files, FORM, given, mtx.lines(files, FORM, given))
lines = {x["이름"]: x for g in got["groups"] for x in g["줄"]}
assert lines["폼타이 9.5㎜"].get(mg.KEY) is None
assert lines["폼타이 12.7㎜"][mg.KEY] is True and lines["폼타이 7.9㎜"][mg.KEY] is True
assert mg.KEY in msl.KEYS # M02 `/logic-lib/sheet` 도 같은 칸
def test_sheet_text_carries_mark():
over = {"폼타이": "사용", "폼타이규격": "9.5㎜"}
groups = mdt.sheet_groups(h.world()[1][FORM], h.calc(FORM, over), h.world()[2])
lines = {x["이름"]: x for g in groups for x in g["줄"]}
assert lines["폼타이 9.5㎜"].get("옵션꺼짐") is None
assert lines["폼타이 12.7㎜"]["옵션꺼짐"] is True and lines["폼타이 7.9㎜"]["옵션꺼짐"] is True
+6 -6
View File
@@ -10,7 +10,7 @@ import pytest
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "master_data/scripts"))
import check_master as cm # noqa: E402
import master_formula as mf # noqa: E402
import helper_855_engine as h # noqa: E402
COEF = "계수_건설품셈_01장_적용기준.json"
LOGIC = "로직_건설품셈_01장_적용기준.json"
@@ -33,7 +33,7 @@ def whole():
def qty(whole, ref, **given) -> Decimal:
line = mf.run(whole, ref, {**BASE, **given} if ref == JIGE else given)["줄"][0]
line = h.calc(ref, {**BASE, **given} if ref == JIGE else given)["줄"][0]
return line["수량"].quantize(Decimal("0.000001"))
@@ -58,7 +58,7 @@ def test_재현(whole, given, want):
def test_북부청_금액(whole):
got = mf.run(whole, JIGE, {**BASE, "운반무게": 575, "운반거리": 6, "운반회수": 42})
got = h.calc(JIGE, {**BASE, "운반무게": 575, "운반거리": 6, "운반회수": 42})
line = got["줄"][0]
assert line["이름"] == "보통인부"
if line["단가"] == 172068: # 2026 상반기 건설노임 — 엑셀 94,227.7
@@ -67,9 +67,9 @@ def test_북부청_금액(whole):
def test_경사_환산_식(whole):
# α 35° = 8 → 환산 48m · V 2,000 · t 2 · T 450 → N 92.21 → 575/25/N
got = mf.run(whole, JIGE, {**BASE, "운반무게": 575, "운반거리": 6, "경사각도": 35})
assert got["중간"]["환산계수"] == 8
assert got["중간"]["작업시간"] == 450
got = h.calc(JIGE, {**BASE, "운반무게": 575, "운반거리": 6, "경사각도": 35})
assert got["값"]["k_환산"] == 8 # 문서 값 칸(기호 이름)
assert got["값"]["T_작업"] == 450
assert got["줄"][0]["수량"].quantize(Decimal("0.000001")) == Decimal("0.249422")
+4 -4
View File
@@ -12,7 +12,7 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "master_data/script
import check_master as cm # noqa: E402
import check_master_toc as toc # noqa: E402
import master_formula as mf # noqa: E402
import helper_855_engine as h # noqa: E402
COEF = "계수_건설품셈_01장_적용기준.json"
LOGIC = "로직_건설품셈_01장_적용기준.json"
@@ -30,7 +30,7 @@ def files():
def result(whole, key, **given) -> Decimal:
return mf.run(whole, key, given)["결과"]
return h.calc(key, given)["결과"]
@pytest.mark.parametrize(
@@ -71,8 +71,8 @@ def test_환경관리비(whole, given, want):
def test_환경관리비_빈칸(whole):
# 원문 「-」(신축 폐금속류) = 줄 없음 — 짐작 값 없이 멈춤
with pytest.raises(mf.FormulaError):
result(whole, WASTE, 공사="신축", 구조="아파트", 폐기물="폐금속류", 면적=1, 증가율=0)
got = h.calc(WASTE, dict(공사="신축", 구조="아파트", 폐기물="폐금속류", 면적=1, 증가율=0))
assert not got["셈됨"] and got["결과"] is None and "줄이 없음" in got["까닭"]
@pytest.mark.parametrize(
+12 -14
View File
@@ -10,7 +10,7 @@ import pytest
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "master_data/scripts"))
import check_master as cm # noqa: E402
import master_formula as mf # noqa: E402
import helper_855_engine as h # noqa: E402
COEF = "계수_건설품셈_08장_건설기계.json"
LOGIC = "로직_건설품셈_08장_건설기계.json"
@@ -50,7 +50,7 @@ def excavator(whole, q, k, f, e, angle, cycle=0):
"싸이클입력": cycle,
"K입력": 0, # 848-4 버킷계수 직접 칸 · 0 = 표
}
return mf.run(whole, EXC, given)["결과"]
return h.calc(EXC, given)["결과"]
@pytest.mark.parametrize(
@@ -172,7 +172,7 @@ BASE_DUMP = {
],
)
def test_덤프트럭_재현(whole, given, want):
assert near(mf.run(whole, DUMP, {**BASE_DUMP, **given})["결과"], want)
assert near(h.calc(DUMP, {**BASE_DUMP, **given})["결과"], want)
def test_롤러_임목파쇄_브레이커(whole):
@@ -188,10 +188,9 @@ def test_롤러_임목파쇄_브레이커(whole):
"W입력": 0, # 851-1 직접 칸 0 = 표
"V입력": 0,
}
assert mf.run(whole, ROLL_A, roll)["결과"] == D("2280.000") # 북부청임도 단산27
assert h.calc(ROLL_A, roll)["결과"] == D("2280.000") # 북부청임도 단산27
assert (
mf.run(
whole,
h.calc(
CHIP,
{
"규격": "93.25㎾",
@@ -215,17 +214,16 @@ def test_롤러_임목파쇄_브레이커(whole):
def test_기본식_원가로직(whole):
got = mf.run(
whole,
got = h.calc(
"GC001143",
{"싸이클시간": 21, "시간단위": "초", "작업량": D("0.9"), "f": D("0.7"), "E": D("0.75")},
)
assert got["중간"]["n"] == D("171.43") and got["결과"] == D("81.001")
assert got["값"]["n"] == D("171.43") and got["결과"] == D("81.001")
# 굴착기 작업량당 기계경비(GC001148) = 813-2 지움 — 기계 넣기 + 작업량 틀(test_813_2_parts)
def test_아세틸렌(whole):
assert mf.run(whole, "GC001191", {"아세틸렌부피": 22400})["결과"] == 26
assert h.calc("GC001191", {"아세틸렌부피": 22400})["결과"] == 26
def test_check_master():
@@ -242,7 +240,7 @@ def test_check_master():
for name in (LOGIC, LOGIC13):
for row in files[name]["줄"]:
if "GC001143" <= row["키"] <= "GC001191":
mf.run(whole, row["키"], cm.시험입력(row)) # 시험 입력으로 멈춤 없음
h.calc(row["키"], cm.시험입력(row)) # 시험 입력으로 멈춤 없음
GUARD = __import__("re").compile(r"만약\((\w+) > 0, \1,")
@@ -258,7 +256,7 @@ def test_가드_칸_자동값(whole):
loose = set()
for row in rows:
auto = ma.values(whole, row)
got = mf.run(whole, row["키"], auto)
got = h.calc(row["키"], auto)
value = got.get("결과", got.get("계"))
assert value >= 0, row["키"]
spec = {i["이름"]: i for i in row["입력"]}
@@ -275,7 +273,7 @@ def test_가드_칸_자동값(whole):
elif name in spec:
loose.add(name)
base = cm.시험입력(row)
zero = mf.run(whole, row["키"], {**base, name: 0})["결과"]
one = mf.run(whole, row["키"], {**base, name: 1})["결과"]
zero = h.calc(row["키"], {**base, name: 0})["결과"]
one = h.calc(row["키"], {**base, name: 1})["결과"]
assert one / zero < 10, (row["키"], name)
assert loose == {"전진거리", "후진거리", "주행거리", "혼합횟수", "플랜트싸이클"}