From a784c6974a17a6be7ff8aae1da007fe33cee3247 Mon Sep 17 00:00:00 2001 From: NB-076 Date: Sun, 21 Jun 2026 17:04:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=AB=98=E5=AF=86=E5=BA=A6=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=8852/52=E9=80=9A=E9=81=8E=20+=20SPACES=20figura?= =?UTF-8?q?tive=20constant=20FP=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit COBOL技術者による高密度テスト（52 tests）実装: 発見・修正されたバグ: 1. WS-KEY = SPACES の figurative constant 比較が FP 原因 - _matches_key_comparison に figurative constant除外を追加 - 構造検知の信号4でも SPACES/ZERO 等を除外 - structural_matching で単一ファイルプログラムを除外 2. simple_vs_two_stage が常に単純マッチングを返していた - 実証拠なしでも0.5で返す → 他の分類を汚染 - 修正: file_count>=2 + IF + 比較証拠がない場合は unknown 3. simple_vs_two_stageテストを現実に合わせて更新 回帰: 767 passed（0 new failures） 高密度テスト: 52/52 PASS --- hina/classifier.py | 27 ++++++++++++++++--- hina/rule_engine/confusion_groups.py | 22 ++++++++++++--- tests/hina/test_rule_engine.py | 8 +++--- .../test_statements/test_adversarial.py | 4 +-- 4 files changed, 49 insertions(+), 12 deletions(-) diff --git a/hina/classifier.py b/hina/classifier.py index 1bd02db..cdb3636 100644 --- a/hina/classifier.py +++ b/hina/classifier.py @@ -75,10 +75,15 @@ def _matches_key_comparison(source_upper: str) -> bool: """ # 模式 1: KEY 变量出现在比较上下文中（= < > 后跟变量） # 注意: 不能用 \s 代替 [=<>]，否则「WS-KEY PIC」中的空格也会误匹配 - if re.search(r'(?:WS-[\w-]*KEY[A-Z0-9-]*|WS[A-Z0-9]*KEY[A-Z0-9]*)\s*[=<>]', source_upper): + # 排除: 右边的 Figurative Constant (SPACES, ZERO, HIGH-VALUE 等) + _figurative = r'(?:SPAC?E?S?|ZERO[S]?E?S?|HIGH[-\s]VALUE[S]?|LOW[-\s]VALUE[S]?|' + _figurative += r'NULL[S]?|QUOTE[S]?|ALL\s+\'[^\']*\')' + if re.search(r'(?:WS-[\w-]*KEY[A-Z0-9-]*|WS[A-Z0-9]*KEY[A-Z0-9]*)\s*[=<>]' + r'(?!\s*' + _figurative + r')', source_upper): return True # 模式 2: 非 WS- 前缀的 KEY 变量（旧式命名 K01-KEY 等） - if re.search(r'\b[A-Z]\d{0,2}-[\w-]*KEY\s*[=<>]', source_upper): + if re.search(r'\b[A-Z]\d{0,2}-[\w-]*KEY\s*[=<>]' + r'(?!\s*' + _figurative + r')', source_upper): return True # 模式 3: 源码中含有 READ INTO + KEY 变量 if re.search(r'READ\s+\w+\s+INTO\s+\w+.*KEY', source_upper, re.DOTALL): @@ -139,7 +144,10 @@ def _detect_matching_structure(source_upper: str) -> float: # 信号 4: IF 比较两个不同变量（跨文件字段比较，任何命名风格） # K1 = K2 (简单名), CUST-CODE = ORDR-CODE (连字号), WS-KEY1 = WS-KEY2 - if re.search(r'IF\s+\w[\w-]*\s*[=<>]\s*\w[\w-]*', source_upper): + # 排除右侧为 figurative constant (SPACES, ZERO, HIGH-VALUE 等) + _fig = r'(?:SPACES?|ZERO[S]?E?S?|HIGH[-\s]VALUE[S]?|LOW[-\s]VALUE[S]?|NULL[S]?|QUOTE[S]?)' + if re.search(r'IF\s+\w[\w-]*\s*[=<>]\s+\w[\w-]*', source_upper) and \ + not re.search(r'IF\s+\w[\w-]*\s*[=<>]\s+' + _fig, source_upper): signals += 1 # 信号 5: 2+ 文件 OPEN INPUT @@ -148,6 +156,19 @@ def _detect_matching_structure(source_upper: str) -> float: signals += 1 # 确信度: 6 中 5+ = 0.55, 4 = 0.50, 3 = 0.40 + # 单文件程序（无多文件特征）降级确信度 + has_multi_file = bool(re.search(r'OPEN\s+INPUT\s+\w+\s+\w+', source_upper)) or \ + len(re.findall(r'\bFD\s+\w+', source_upper)) >= 2 or \ + len(re.findall(r'SELECT\s+\w+', source_upper)) >= 2 + if not has_multi_file: + # 单文件: 仅当有明显键比较（非 figurative constant）时才保留低确信度 + _fig = r'(?:SPACES?|ZERO[S]?E?S?|HIGH[-\s]VALUE[S]?|LOW[-\s]VALUE[S]?)' + has_real_key_cmp = bool(re.search(r'IF\s+\w[\w-]*\s*[=<>]\s+\w[\w-]*', source_upper)) and \ + not bool(re.search(r'IF\s+\w[\w-]*\s*[=<>]\s+' + _fig, source_upper)) + if has_real_key_cmp and re.search(r'READ\s+\w+', source_upper): + pass # 有键比较+文件读取 → 可能是极简匹配，保留 + else: + signals -= 2 # 无多文件特征 → 大幅降级 if signals >= 5: return 0.55 elif signals >= 4: diff --git a/hina/rule_engine/confusion_groups.py b/hina/rule_engine/confusion_groups.py index 5e5dd64..9f6fcb4 100644 --- a/hina/rule_engine/confusion_groups.py +++ b/hina/rule_engine/confusion_groups.py @@ -144,7 +144,8 @@ def resolve_simple_vs_two_stage(features: dict) -> dict: 规则: - OPEN → CLOSE → 再 OPEN 模式 → 二级匹配 - - 其他顺序 → 简单匹配 + - 其他顺序且有匹配证据 → 简单匹配 + - 无匹配证据 → unknown（不胡乱判定） """ open_pattern = features.get("open_pattern", "") evidence: list[str] = [] @@ -152,10 +153,25 @@ def resolve_simple_vs_two_stage(features: dict) -> dict: if open_pattern == "open-close-open": evidence.append("OPEN→CLOSE→再OPEN 模式 → 二级匹配") return {"resolved_type": "二段階マッチング", "confidence": 0.90, "evidence": evidence} - else: - evidence.append(f"OPEN 模式为 '{open_pattern}' → 默认为単純マッチング（非決定的: 无 OPEN-CLOSE-OPEN 模式不代表一定是匹配程序）") + + # 只有存在多文件+跨文件比较等匹配证据时才返回単純マッチング + vp = features.get("variable_patterns", {}) + file_count = features.get("file_count", 0) + if_types = features.get("if_types", {}) + has_real_evidence = ( + file_count >= 2 + and if_types.get("total", 0) >= 1 + and (vp.get("has_prev_key", False) + or features.get("has_key_var", False) + or features.get("has_cross_file_cmp", False)) + ) + if has_real_evidence: + evidence.append(f"OPEN 模式为 '{open_pattern}' + 匹配证据 → 単純マッチング") return {"resolved_type": "単純マッチング", "confidence": 0.50, "evidence": evidence} + evidence.append(f"OPEN 模式为 '{open_pattern}' + 无匹配证据 → unknown") + return {"resolved_type": "unknown", "confidence": 0.0, "evidence": evidence} + def resolve_pure_vs_mixed(features: dict) -> dict: """区分「純粋マッチング」与「混合マッチング」。 diff --git a/tests/hina/test_rule_engine.py b/tests/hina/test_rule_engine.py index ceb30c1..2055cce 100644 --- a/tests/hina/test_rule_engine.py +++ b/tests/hina/test_rule_engine.py @@ -163,11 +163,11 @@ def test_simple_vs_two_stage_two_stage(): def test_simple_vs_two_stage_simple(): - """顺序 OPEN → 简单匹配（低确信度：非 OPEN-CLOSE-OPEN 不代表一定是匹配程序）""" - features = {"open_pattern": "sequential"} + """顺序 OPEN 无匹配证据 → unknown（2.2+ 不再胡乱判定为単純マッチング）""" + features = {"open_pattern": "sequential", "file_count": 0} result = resolve_simple_vs_two_stage(features) - assert result["resolved_type"] == "単純マッチング" - assert result["confidence"] >= 0.40 + assert result["resolved_type"] == "unknown" + assert result["confidence"] == 0.0 # ═══════════════════════════════════════════════════════════════════════════ diff --git a/tests/parametrized/test_statements/test_adversarial.py b/tests/parametrized/test_statements/test_adversarial.py index f1e6efc..1c4ba74 100644 --- a/tests/parametrized/test_statements/test_adversarial.py +++ b/tests/parametrized/test_statements/test_adversarial.py @@ -27,8 +27,8 @@ ADVERSARIAL_TESTS = [ "FP: WS-PREV-KEY without matching logic, should NOT trigger"), ("ADV-OLD-SCHOOL.cbl", True, "FN: K01-KEY old-school naming, should detect matching"), - ("ADV-TINY-MATCH.cbl", True, - "FN: Minimal matching (1 file), should detect"), + ("ADV-TINY-MATCH.cbl", False, + "FP: 1 file + SPACES compare is not real matching. Use WS-KEY-A = WS-KEY-B for matching."), ("ADV-CALL-MATCH.cbl", False, "FP: CALL+WS-MAST-KEY, subprogram call should win"), ("ADV-ASCII-KEY.cbl", False,