From 3302dcfc8239a9c8cb57cf798ffc8160bd176469 Mon Sep 17 00:00:00 2001 From: traMectory Date: Thu, 10 Oct 2024 15:03:10 +0200 Subject: [PATCH] Fix for rational Steiner points --- src/cgshop2025_pyutils/verifier/verifier.py | 4 ++-- tests/test_verify.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cgshop2025_pyutils/verifier/verifier.py b/src/cgshop2025_pyutils/verifier/verifier.py index 181551a..30fb427 100644 --- a/src/cgshop2025_pyutils/verifier/verifier.py +++ b/src/cgshop2025_pyutils/verifier/verifier.py @@ -4,7 +4,7 @@ from cgshop2025_pyutils.data_schemas.instance import Cgshop2025Instance from cgshop2025_pyutils.data_schemas.solution import Cgshop2025Solution -from cgshop2025_pyutils.geometry import Point, VerificationGeometryHelper +from cgshop2025_pyutils.geometry import Point, VerificationGeometryHelper, FieldNumber class VerificationResult(BaseModel): @@ -21,7 +21,7 @@ def verify( # Combine instance and solution points into one loop to simplify the logic all_points = [Point(x, y) for x, y in zip(instance.points_x, instance.points_y)] all_points.extend( - Point(x, y) + Point(FieldNumber(x), FieldNumber(y)) for x, y in zip(solution.steiner_points_x, solution.steiner_points_y) ) diff --git a/tests/test_verify.py b/tests/test_verify.py index 7ca2877..09cad00 100644 --- a/tests/test_verify.py +++ b/tests/test_verify.py @@ -113,8 +113,8 @@ def test_verify_correct_solution_extra_points(): ) solution = Cgshop2025Solution( instance_uid=instance.instance_uid, - steiner_points_x=[272, 320], - steiner_points_y=[512, 512], + steiner_points_x=["272/1", 320], + steiner_points_y=[512, "1024/2"], edges=[ [0, 5], [5, 6],