From ceac4ebc7d2ae343cf125939d71feaa2147a6b72 Mon Sep 17 00:00:00 2001 From: marktech0813 Date: Fri, 24 Jul 2026 14:34:36 +0000 Subject: [PATCH] fix(scoring): unwrap \cfrac like other LaTeX fraction commands _FRACTION_CMDS omitted cfrac, so continued-fraction answers never matched slash or frac gold forms (#477). Co-authored-by: Cursor --- pyproject.toml | 2 +- src/trinity/adapters/drop.py | 34 +++++++++++++++++++---------- src/trinity/orchestration/reward.py | 2 +- tests/test_reward_cfrac.py | 8 +++++++ 4 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 tests/test_reward_cfrac.py diff --git a/pyproject.toml b/pyproject.toml index 02d4f008..e911c0da 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 1314803f..07fcbd4f 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 7192ef8e..8b87e1c2 100644 --- a/src/trinity/orchestration/reward.py +++ b/src/trinity/orchestration/reward.py @@ -607,7 +607,7 @@ def _unwrap_font_commands(s: str) -> str: return s -_FRACTION_CMDS = ("dfrac", "tfrac", "frac") +_FRACTION_CMDS = ("dfrac", "tfrac", "cfrac", "frac") def _scan_brace_group(s: str, start: int) -> tuple[str, int] | None: diff --git a/tests/test_reward_cfrac.py b/tests/test_reward_cfrac.py new file mode 100644 index 00000000..de24ee20 --- /dev/null +++ b/tests/test_reward_cfrac.py @@ -0,0 +1,8 @@ +"""\\cfrac must unwrap like \\frac / \\dfrac / \\tfrac (#477).""" +from __future__ import annotations +from trinity.orchestration import reward as R + +def test_cfrac_normalizes_like_frac(): + assert "\\cfrac" not in R.normalize_math_answer(r"\cfrac{1}{2}") + assert R.math_equal(r"\cfrac{1}{2}", "1/2") + assert R.score_text("math500", r"\boxed{\cfrac{1}{2}}", "1/2") == 1.0