From 54677c2bd56b5df36bfce40c3a30ce0b709dec7a Mon Sep 17 00:00:00 2001 From: suleman-uzair Date: Thu, 12 Nov 2026 20:40:36 +0500 Subject: [PATCH] Build against unitsml-rs cdfbcc3 and replay the Ruby point/difference cases unitsml-rs main cdfbcc3 adds two point/difference fixes that match unitsml-ruby: a difference minus an absolute point is a difference (85a4485, unitsml/unitsml-rs#3), and a difference plus a point answers in the difference's unit (cdfbcc3, unitsml/unitsml-rs#4). Cargo.lock is unchanged since 4aa5f3f; the unitsdb-rs, asciiunits-python 9a405a5 and F40 corpus pins are unchanged. tests/point-difference-vectors.json holds the 24 point/difference add and subtract cases from unitsml-ruby 2ec9583. tests/test_point_difference.py checks each case's exact magnitude, unit and scale against the installed wheel. --- ci/native-source.json | 5 +- native-source.json | 4 +- tests/point-difference-vectors.json | 573 ++++++++++++++++++++++++++++ tests/test_dependency_pins.py | 2 +- tests/test_point_difference.py | 38 ++ 5 files changed, 617 insertions(+), 5 deletions(-) create mode 100644 tests/point-difference-vectors.json create mode 100644 tests/test_point_difference.py diff --git a/ci/native-source.json b/ci/native-source.json index b70dddb..0c1c578 100644 --- a/ci/native-source.json +++ b/ci/native-source.json @@ -7,7 +7,7 @@ "kind": "prebuilt-library", "repository": "unitsml/unitsml-rs", "local": "workspace/units-native/unitsml-rs", - "revision": "14c17076b7199940acaf9ce1f0272f3808b389bd", + "revision": "cdfbcc3087f271d8723b3c3d1e4764860601e570", "public": true, "deps": { "unitsdb_rs": { @@ -36,7 +36,8 @@ "tests": [ "tests/test_installed.py", "tests/test_register_scope.py", - "tests/test_dependency_pins.py" + "tests/test_dependency_pins.py", + "tests/test_point_difference.py" ], "python_runtime": { "repository": "parsanol/parsanol-python", diff --git a/native-source.json b/native-source.json index faabefc..53252a4 100644 --- a/native-source.json +++ b/native-source.json @@ -1,6 +1,6 @@ { - "native_source_commit": "14c17076b7199940acaf9ce1f0272f3808b389bd", - "library_sha256": "b09f4f7c61cec01af521ae5bb714cd8bedd5216852ea27b103c86dc16782019e", + "native_source_commit": "cdfbcc3087f271d8723b3c3d1e4764860601e570", + "library_sha256": "959e3876df27a7f26078bb257dbeecf98ba4350de8c3c4ef539eb5a23355723e", "cargo_lock_sha256": "949a6198b0462cc6096a18fc85e0e3a220bea0ae66b0d2c6e2979c0bb7a80946", "unitsdb_commit": "969a131b8992930a6ff6f869291f1f0d7cb68d33", "unitsdb_data_sha256": "595e987112aed69d06ac2e68fda4b12e58266d5577ccd8cd8aa2cdc56eb765d4", diff --git a/tests/point-difference-vectors.json b/tests/point-difference-vectors.json new file mode 100644 index 0000000..660aa14 --- /dev/null +++ b/tests/point-difference-vectors.json @@ -0,0 +1,573 @@ +{ + "profile": "unitsml-point-difference/v1", + "reference": { + "repository": "unitsml/unitsml-ruby", + "commit": "2ec9583a1902a2c13fd508f3bec558a2adde5de7", + "unitsdb_gem": "2.2.15", + "lutaml_model": "0.8.175", + "ruby": "4.0.1", + "probe_output_sha256": "d18eb0c0873ebe377361e9751913199010903ec004392ba7d243b1f70f796d12" + }, + "native": { + "repository": "unitsml/unitsml-rs", + "commit": "cdfbcc3087f271d8723b3c3d1e4764860601e570", + "changes": [ + "85a4485 (unitsml/unitsml-rs#3): a difference minus a point is a difference", + "cdfbcc3 (unitsml/unitsml-rs#4): a difference plus a point answers in the difference's unit" + ] + }, + "cases": [ + { + "left": { + "value": "20", + "unit": "degC", + "difference": false + }, + "op": "+", + "right": { + "value": "15", + "unit": "degC", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "35", + "1" + ], + "unit": "degC", + "scale": "interval", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": false + }, + "op": "-", + "right": { + "value": "15", + "unit": "degC", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "5", + "1" + ], + "unit": "degC", + "scale": "difference", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": false + }, + "op": "+", + "right": { + "value": "15", + "unit": "degC", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "35", + "1" + ], + "unit": "degC", + "scale": "interval", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": false + }, + "op": "-", + "right": { + "value": "15", + "unit": "degC", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "5", + "1" + ], + "unit": "degC", + "scale": "interval", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": true + }, + "op": "+", + "right": { + "value": "15", + "unit": "degC", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "35", + "1" + ], + "unit": "degC", + "scale": "interval", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": true + }, + "op": "-", + "right": { + "value": "15", + "unit": "degC", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "5", + "1" + ], + "unit": "degC", + "scale": "difference", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": true + }, + "op": "+", + "right": { + "value": "15", + "unit": "degC", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "35", + "1" + ], + "unit": "degC", + "scale": "difference", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": true + }, + "op": "-", + "right": { + "value": "15", + "unit": "degC", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "5", + "1" + ], + "unit": "degC", + "scale": "difference", + "kind": null + } + }, + { + "left": { + "value": "5", + "unit": "K", + "difference": false + }, + "op": "+", + "right": { + "value": "20", + "unit": "degC", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "5963", + "20" + ], + "unit": "K", + "scale": "ratio", + "kind": null + } + }, + { + "left": { + "value": "5", + "unit": "K", + "difference": false + }, + "op": "-", + "right": { + "value": "20", + "unit": "degC", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "-5763", + "20" + ], + "unit": "K", + "scale": "difference", + "kind": null + } + }, + { + "left": { + "value": "5", + "unit": "K", + "difference": false + }, + "op": "+", + "right": { + "value": "20", + "unit": "degC", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "25", + "1" + ], + "unit": "K", + "scale": "ratio", + "kind": null + } + }, + { + "left": { + "value": "5", + "unit": "K", + "difference": false + }, + "op": "-", + "right": { + "value": "20", + "unit": "degC", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "-15", + "1" + ], + "unit": "K", + "scale": "ratio", + "kind": null + } + }, + { + "left": { + "value": "5", + "unit": "K", + "difference": true + }, + "op": "+", + "right": { + "value": "20", + "unit": "degC", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "5963", + "20" + ], + "unit": "K", + "scale": "ratio", + "kind": null + } + }, + { + "left": { + "value": "5", + "unit": "K", + "difference": true + }, + "op": "-", + "right": { + "value": "20", + "unit": "degC", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "-5763", + "20" + ], + "unit": "K", + "scale": "difference", + "kind": null + } + }, + { + "left": { + "value": "5", + "unit": "K", + "difference": true + }, + "op": "+", + "right": { + "value": "20", + "unit": "degC", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "25", + "1" + ], + "unit": "K", + "scale": "difference", + "kind": null + } + }, + { + "left": { + "value": "5", + "unit": "K", + "difference": true + }, + "op": "-", + "right": { + "value": "20", + "unit": "degC", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "-15", + "1" + ], + "unit": "K", + "scale": "difference", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": false + }, + "op": "+", + "right": { + "value": "288.15", + "unit": "K", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "35", + "1" + ], + "unit": "degC", + "scale": "interval", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": false + }, + "op": "-", + "right": { + "value": "288.15", + "unit": "K", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "5", + "1" + ], + "unit": "degC", + "scale": "difference", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": false + }, + "op": "+", + "right": { + "value": "288.15", + "unit": "K", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "6163", + "20" + ], + "unit": "degC", + "scale": "interval", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": false + }, + "op": "-", + "right": { + "value": "288.15", + "unit": "K", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "-5363", + "20" + ], + "unit": "degC", + "scale": "interval", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": true + }, + "op": "+", + "right": { + "value": "288.15", + "unit": "K", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "35", + "1" + ], + "unit": "degC", + "scale": "interval", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": true + }, + "op": "-", + "right": { + "value": "288.15", + "unit": "K", + "difference": false + }, + "outcome": "ok", + "result": { + "value": [ + "5", + "1" + ], + "unit": "degC", + "scale": "difference", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": true + }, + "op": "+", + "right": { + "value": "288.15", + "unit": "K", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "6163", + "20" + ], + "unit": "degC", + "scale": "difference", + "kind": null + } + }, + { + "left": { + "value": "20", + "unit": "degC", + "difference": true + }, + "op": "-", + "right": { + "value": "288.15", + "unit": "K", + "difference": true + }, + "outcome": "ok", + "result": { + "value": [ + "-5363", + "20" + ], + "unit": "degC", + "scale": "difference", + "kind": null + } + } + ] +} diff --git a/tests/test_dependency_pins.py b/tests/test_dependency_pins.py index 71585ac..e046e30 100644 --- a/tests/test_dependency_pins.py +++ b/tests/test_dependency_pins.py @@ -13,7 +13,7 @@ def test_asciiunits_native_build(self): def test_unitsml_native_build(self): info = json.loads(files("unitsml").joinpath("_native", "build-info.json").read_bytes()) - self.assertEqual(info["native_source_commit"], "14c17076b7199940acaf9ce1f0272f3808b389bd") + self.assertEqual(info["native_source_commit"], "cdfbcc3087f271d8723b3c3d1e4764860601e570") notices = json.loads(files("unitsml").joinpath("_native", "licenses", "manifest.json").read_bytes()) self.assertNotIn("parsanol", [row["name"] for row in notices]) diff --git a/tests/test_point_difference.py b/tests/test_point_difference.py new file mode 100644 index 0000000..cadc13c --- /dev/null +++ b/tests/test_point_difference.py @@ -0,0 +1,38 @@ +import json +from pathlib import Path +import unittest + +import unitsml + +VECTORS = json.loads(Path(__file__).with_name("point-difference-vectors.json").read_bytes()) +OPS = {"+": "add", "-": "subtract"} + + +def operand(side): + return {"value": side["value"], "expression": side["unit"], "difference": side["difference"]} + + +def exact_ratio(text): + return text if "/" in text else text + "/1" + + +class InstalledPointDifferenceTests(unittest.TestCase): + """Point and difference sums and differences answer exactly as unitsml-ruby does.""" + + def test_all_ruby_cases(self): + self.assertEqual(VECTORS["profile"], "unitsml-point-difference/v1") + self.assertEqual(len(VECTORS["cases"]), 24) + for index, case in enumerate(VECTORS["cases"]): + with self.subTest(case=index, left=case["left"], op=case["op"], right=case["right"]): + self.assertEqual(case["outcome"], "ok") + expected = case["result"] + result = unitsml.evaluate({"op": OPS[case["op"]], "left": operand(case["left"]), + "right": operand(case["right"])}) + self.assertEqual(exact_ratio(result["magnitude"]), "/".join(expected["value"])) + self.assertEqual(result["scale"], expected["scale"]) + unit = unitsml.evaluate({"op": "resolve", "left": {"value": "1", "expression": expected["unit"]}}) + self.assertEqual(result["terms"], unit["terms"]) + + +if __name__ == "__main__": + unittest.main()