diff --git a/pyproject.toml b/pyproject.toml index 02d4f00..e911c0d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ dependencies = [ ] [project.optional-dependencies] -dev = ["pytest>=8.0", "ruff>=0.5", "mypy>=1.10"] +dev = ["pytest>=8.0", "ruff>=0.5,<0.16", "mypy>=1.10"] [build-system] requires = ["hatchling"] diff --git a/src/trinity/adapters/drop.py b/src/trinity/adapters/drop.py index 1314803..07fcbd4 100644 --- a/src/trinity/adapters/drop.py +++ b/src/trinity/adapters/drop.py @@ -130,9 +130,12 @@ def _maybe_unbox(segment: str) -> str: return boxed if boxed is not None else "" -#: Surrounding punctuation stripped from a token, EXCLUDING the signs ``+``/``-`` — a -#: leading sign is part of a number's value, not wrapping noise. -_STRIP_EDGE = "".join(c for c in string.punctuation if c not in "+-") +#: Surrounding punctuation stripped from a token, EXCLUDING the signs ``+``/``-`` and +#: the decimal point ``.`` — a leading sign or decimal point is part of a number's +#: value, not wrapping noise. A genuinely-trailing ``.`` (sentence period) is handled +#: by the dedicated rstrip retry in :func:`_normalize_token`, which can tell it apart +#: from a value-bearing leading point; a blanket edge-strip cannot. +_STRIP_EDGE = "".join(c for c in string.punctuation if c not in "+-.") def _normalize_token(raw: str) -> str: @@ -147,20 +150,27 @@ def _normalize_token(raw: str) -> str: dropped the ``-`` and left commas to break ``float()``) did not deliver. A token that is ALREADY a number is recognised before any punctuation is - stripped: the edge-strip set includes ``.``, so a leading-decimal token like - ``".5"`` would otherwise lose its point and normalize to ``"5.0"`` — equal to - a gold ``"5"`` (false positive) and unequal to the value-identical gold - ``"0.5"`` (false negative). The official DROP ``_remove_punc`` tests - ``_is_number`` first and leaves numbers untouched for exactly this reason.""" + stripped: a leading-decimal token like ``".5"`` must not lose its point and + normalize to ``"5.0"`` — equal to a gold ``"5"`` (false positive) and unequal + to the value-identical gold ``"0.5"`` (false negative). The official DROP + ``_remove_punc`` tests ``_is_number`` first and leaves numbers untouched for + exactly this reason (issue #423). The float-first path alone only covers the + *bare* token: with ``.`` in the edge-strip set, wrapped forms like ``"$.5"`` + and ``".5."`` still lost the leading point on the second-chance path. So the + edge strip excludes ``.`` entirely, and a genuinely-trailing period (``".5."``, + ``"16.."``) is retried with an explicit ``rstrip(".")`` — right-side dots are + sentence punctuation, left-side dots are value.""" try: return str(float(raw.replace(",", ""))) except ValueError: pass core = raw.strip(_STRIP_EDGE) - try: - return str(float(core.replace(",", ""))) - except ValueError: - return _PUNCT.sub("", raw) + for cand in (core, core.rstrip(".")): + try: + return str(float(cand.replace(",", ""))) + except ValueError: + continue + return _PUNCT.sub("", raw) def _split_internal_hyphens(token: str) -> list[str]: diff --git a/src/trinity/orchestration/reward.py b/src/trinity/orchestration/reward.py index 7192ef8..dcc7ee7 100644 --- a/src/trinity/orchestration/reward.py +++ b/src/trinity/orchestration/reward.py @@ -795,6 +795,12 @@ def normalize_math_answer(ans: str | None) -> str: # \text{5}/\mathrm{5} already do (otherwise a bold-formatted answer is a false # negative against a plain reference). s = _unwrap_font_commands(s) + # Approximation hedges are presentation, not value: models often box + # ``\approx 12`` / ``\sim 3`` for a gold ``12`` / ``3``. Strip the command + # (and the Unicode ≈ glyph) so boxed approx-forms grade by the number + # (issue #474). Do NOT strip ``\pm`` — that changes the value. + s = re.sub(r"\\(?:approx|simeq|sim|thickapprox)(?![a-zA-Z])\s*", "", s) + s = s.replace("≈", "") s = s.replace(r"\%", "").replace("%", "") # Degree symbol in either brace form: ``^\circ`` and ``^{\circ}``. The braced # form is common LaTeX and was previously left intact, so ``90^{\circ}`` never diff --git a/tests/test_reward_approx_prefix.py b/tests/test_reward_approx_prefix.py new file mode 100644 index 0000000..5b47737 --- /dev/null +++ b/tests/test_reward_approx_prefix.py @@ -0,0 +1,23 @@ +"""Approximation prefixes in boxed math answers are presentation (#474).""" + +from __future__ import annotations + +from trinity.orchestration import reward as R + + +def test_normalize_strips_approx_family() -> None: + assert R.normalize_math_answer(r"\approx 12") == "12" + assert R.normalize_math_answer(r"\sim 3") == "3" + assert R.normalize_math_answer(r"\simeq 3") == "3" + assert "≈" not in R.normalize_math_answer("≈12") + assert R.normalize_math_answer("≈12") == "12" + + +def test_boxed_approx_matches_gold_number() -> None: + assert R.score_text("math500", r"\boxed{\approx 12}", "12") == 1.0 + assert R.score_text("math500", r"\boxed{\sim 3}", "3") == 1.0 + + +def test_pm_is_not_stripped() -> None: + # \pm changes meaning — must not collapse to the magnitude alone. + assert R.score_text("math500", r"\boxed{\pm 5}", "5") == 0.0