refactor(855-E 2-E4 ㉯-4 ⑥): 옛 계산 엔진 몸 지움 — master_formula 무리 아홉 · 계산기 하나

- git rm(부르는 곳 0 다시 셈 — import · import_module 글 · getattr 별칭 cm.mf · store.mau · mtx 포함): master_formula · master_formula_check · master_formula_sum · master_text · master_text_item · master_sheet_line · master_gate · master_auto · master_copy(−2,625 줄)
- master_cut = down · row · sums 만(일위대가 반영 끝수 · TS 짝) — engine · settle · plain · _line · _sub · kept(손님 0) 지움 · 바탕 = master_base
- master_bundle = BUNDLES · BY_ITEM · BY_KIND · is_machine(M01 목록 묶음) — called · bundle · tag 지움 · master_combo = 조합 칸만(run 지움)
- check_master · check_master_body · compare_estx: import master_formula → master_base(바탕 이름만) · compare_estx 기계 · 일위대가 대조 = 수식 문서 셈(옛 mf.run · 로직 줄 고르기 덧붙임 걷음 · 일위대가 28 · 기계 207 건 그대로 나옴)
- M01 Store: 다시 내보냄 mau · mtx 지움(부르는 곳 0) · cm.mf = master_base
- 죽은 주석: master_material · master_pick · master_base · Item_Prices · San_Emit · check_master
- test_855_sk_layers: 옛 엔진 안 돎 = 엔진 모듈 없음 확인
- 검증: 관련 146 파일 1,135 통과 · test_855_golden 전수 지문 같음 · 모든 제품 · scripts 모듈 읽기 깨짐 0 · typecheck 0 · 8008 health 200 · 로그 오류 0 · 서버 길 469 → 469

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-18 16:02:20 +09:00
co-authored by Claude Opus 5.5
parent 4c17c8ff13
commit dd8759edc5
22 changed files with 48 additions and 2931 deletions
+22 -23
View File
@@ -17,7 +17,9 @@ from pathlib import Path
sys.path.insert(0, str(Path(__file__).parent))
import check_master as cm # noqa: E402
import master_formula as mf # noqa: E402
import master_base as mf # noqa: E402
import master_doc_calc as mc # noqa: E402
import master_doc_link as ml # noqa: E402
ROOT = Path(__file__).resolve().parents[3]
ESTX = ROOT / "resources/knowledge/original/경쟁사 프로그램/EST Plus 2/다산소프트/2026-07-main.estx"
@@ -244,23 +246,19 @@ def mach_key(name, size) -> str:
return norm(n) + "|" + size
def _names(doc: dict) -> set[str]:
return {str(v.get("열쇠")) for v in doc.get("변수") or []}
def machine_cost(master: mf.Master, mid: str, region="전국평균"):
"""로직으로 계산 — 고르기 밖 기계는 메모리에서만 고르기에 더함."""
"""수식 문서로 계산(옛 엔진 = 855-E 2-E4 걷음) — 목록 밖 기계도 원문번호로 받음."""
docs = ml.load_all()
links = ml.Links(master, docs)
for key in LOGICS:
row = master.logic(key)
spec = next(i for i in row["입력"] if i["이름"] == "기계")
added = mid not in spec["고르기"]
if added:
spec["고르기"].append(mid)
try:
given = {"기계": mid, "지역": region}
given = {k: v for k, v in given.items() if any(i["이름"] == k for i in row["입력"])}
return key, mf.run(master, key, given)
except (mf.FormulaError, ArithmeticError, KeyError, TypeError):
continue
finally:
if added:
spec["고르기"].remove(mid)
given = {k: v for k, v in {"기계": mid, "지역": region}.items() if k in _names(docs[key])}
res = mc.calc(docs[key], links, given)
if res.get("셈됨"):
return key, res
return None, None
@@ -449,15 +447,16 @@ def unit_price(estx: Estx, master: mf.Master):
h = heads[code]
k = Decimal(scale[0]) if scale else Decimal(1)
temp, put = with_estx_materials(master, estx, code)
row = temp.logic(key)
given = {k: v for k, v in given.items() if any(i["이름"] == k for i in row.get("입력", []))}
docs = ml.load_all()
row = docs[key] # 수식 문서(옛 엔진 = 855-E 2-E4 걷음)
given = {k: v for k, v in given.items() if k in _names(row)}
given = {k: Decimal(str(v)) if isinstance(v, (int, float)) else v for k, v in given.items()}
try:
res = mf.run(temp, key, given)
res = {c: res[c] * k for c in ("계", *mf.COST_ITEMS)}
except (mf.FormulaError, ArithmeticError, KeyError, TypeError) as e:
print(f" {code} {h['Name']} {h.get('Size')} | {key} | 멈춤: {str(e)[:120]}")
res = mc.calc(row, ml.Links(temp, docs), given)
if not res.get("셈됨"):
why = res.get("까닭") or res.get("표지")
print(f" {code} {h['Name']} {h.get('Size')} | {key} | 멈춤: {str(why)[:120]}")
continue
res = {c: res[c] * k for c in ("계", *mf.COST_ITEMS)}
r = rate(h["TC"], res["계"])
rates.append(r)
print(