Update core/scoring.py

core/scoring.py

@@ -1,55 +1,60 @@
+# core/scoring.py
 from __future__ import annotations
 from typing import Dict, Any
 
-def _nz(x):
+def _safe_ratio(a, b):
     try:
-        return float(x) if x is not None else 0.0
+        if a is None or b in (None, 0):
+            return None
+        return float(a) / float(b)
     except Exception:
-        return 0.0
-
-def clamp(x, lo=0, hi=100): return max(lo, min(hi, x))
+        return None
+
+def _ramp(x, good, bad, lo=0.0, hi=100.0, neutral=50.0):
+    if x is None:
+        return neutral
+    if good > bad:
+        if x <= bad: return lo
+        if x >= good: return hi
+        return lo + (hi-lo) * (x-bad)/(good-bad)
+    else:
+        if x >= bad: return lo
+        if x <= good: return hi
+        return lo + (hi-lo) * (x-good)/(bad-good)
 
 def score_company(fin: Dict[str, Any]) -> Dict[str, Any]:
-    """
-    すべて『円』換算済みの fin を前提
-    数量スケールの違いで比率が歪まないよう、原則として比率/マージン/回転率ベースで採点
-    """
-    bs = fin.get("balance_sheet", {}) or {}
-    pl = fin.get("income_statement", {}) or {}
-
-    assets   = _nz(bs.get("total_assets"))
-    equity   = _nz(bs.get("total_equity"))
-    curA     = _nz(bs.get("current_assets"))
-    curL     = _nz(bs.get("current_liabilities"))
-    sales    = _nz(pl.get("sales"))
-    opinc    = _nz(pl.get("operating_income"))
-    netinc   = _nz(pl.get("net_income"))
-
-    # 比率
-    equity_ratio    = equity / assets if assets > 0 else 0.0
-    current_ratio   = curA / curL if curL > 0 else (2.0 if curA > 0 else 0.0)
-    op_margin       = opinc / sales if sales > 0 else 0.0
-    net_margin      = netinc / sales if sales > 0 else 0.0
-    roa             = netinc / assets if assets > 0 else 0.0
-
-    # スコア（100点換算）
-    s_equity   = clamp(equity_ratio * 200)            # 50%で100
-    s_liquid   = clamp((current_ratio / 2.0) * 100)   # 200%で100
-    s_opm      = clamp(op_margin * 400)               # 25%で100
-    s_npm      = clamp(net_margin * 400)              # 25%で100
-    s_roa      = clamp(roa * 1000)                    # 10%で100
-
-    details = [
-        {"metric": "自己資本比率", "value": round(equity_ratio*100, 2), "score": round(s_equity,1), "unit":"%"},
-        {"metric": "流動比率",   "value": round(current_ratio*100, 1), "score": round(s_liquid,1), "unit":"%"},
-        {"metric": "営業利益率", "value": round(op_margin*100, 2),     "score": round(s_opm,1),    "unit":"%"},
-        {"metric": "純利益率",   "value": round(net_margin*100, 2),     "score": round(s_npm,1),    "unit":"%"},
-        {"metric": "ROA",       "value": round(roa*100, 2),            "score": round(s_roa,1),    "unit":"%"},
-    ]
-
-    total = round(sum(d["score"] for d in details) / len(details), 1)
-    grade = ("S" if total >= 85 else
-             "A" if total >= 70 else
-             "B" if total >= 55 else
-             "C" if total >= 40 else "D")
-    return {"total_score": total, "grade": grade, "details": details, "assumption":"金額は円換算済み"}
+    bs = fin.get("balance_sheet") or {}
+    is_ = fin.get("income_statement") or {}
+    cf = fin.get("cash_flows") or {}
+
+    ca = bs.get("current_assets")
+    cl = bs.get("current_liabilities")
+    ta = bs.get("total_assets")
+    tl = bs.get("total_liabilities")
+
+    sales = is_.get("sales")
+    opinc = is_.get("operating_income")
+    ni = is_.get("net_income")
+
+    ocf = cf.get("operating_cash_flow")
+    fcf = None
+    if ocf is not None and is_.get("operating_expenses") is not None:
+        fcf = ocf - is_.get("operating_expenses")
+
+    # 単位ばらつき吸収：比率中心
+    cr = _safe_ratio(ca, cl)           # 流動比率
+    lev = _safe_ratio(tl, ta)          # 負債比率
+    opm = _safe_ratio(opinc, sales)    # 営業利益率
+    npm = _safe_ratio(ni, sales)       # 純利益率
+    ocf_ms = _safe_ratio(ocf, sales)   # 営業CF/売上
+
+    details = []
+    details.append({"metric": "流動比率", "score": round(_ramp(cr, 2.0, 0.8),1)})
+    details.append({"metric": "負債比率(低い程良)", "score": round(_ramp(lev, 0.4, 1.2),1)})
+    details.append({"metric": "営業利益率", "score": round(_ramp(opm, 0.12, 0.00),1)})
+    details.append({"metric": "純利益率", "score": round(_ramp(npm, 0.08, -0.05),1)})
+    details.append({"metric": "営業CF/売上", "score": round(_ramp(ocf_ms, 0.10, -0.05),1)})
+
+    total = round(sum(d["score"] for d in details)/len(details), 1)
+    grade = "S" if total>=85 else "A" if total>=75 else "B" if total>=65 else "C" if total>=50 else "D"
+    return {"total_score": total, "grade": grade, "details": details}