From 8baca08696950e9ac4c503a4582a0ecba10240fc Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sun, 2 Mar 2025 15:09:26 -0500 Subject: [PATCH] chore: rename var --- joj3_config_generator/models/task.py | 6 +++--- joj3_config_generator/processers/task.py | 6 +++--- tests/convert/basic/task.json | 2 +- tests/convert/basic/task.toml | 6 +++--- tests/convert/diff/task.toml | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/joj3_config_generator/models/task.py b/joj3_config_generator/models/task.py index 212c914..9b02636 100644 --- a/joj3_config_generator/models/task.py +++ b/joj3_config_generator/models/task.py @@ -33,7 +33,7 @@ class ParserLog(BaseModel): class ParserDummy(BaseModel): comment: str = "" score: int = 0 - forcequit: bool = False + force_quit: bool = False class ParserKeyword(BaseModel): @@ -43,9 +43,9 @@ class ParserKeyword(BaseModel): class Outputs(BaseModel): score: int = 0 - ignorespaces: bool = True + ignore_spaces: bool = True hide: bool = False - forcequit: bool = False + force_quit: bool = False class ParserDiff(BaseModel): diff --git a/joj3_config_generator/processers/task.py b/joj3_config_generator/processers/task.py index 41c91f7..9b3f89d 100644 --- a/joj3_config_generator/processers/task.py +++ b/joj3_config_generator/processers/task.py @@ -151,7 +151,7 @@ def fix_dummy( result.DummyConfig( score=task_stage.result_status.score, comment=task_stage.result_status.comment, - force_quit_on_not_accepted=task_stage.result_status.forcequit, + force_quit_on_not_accepted=task_stage.result_status.force_quit, ).model_dump(by_alias=True) ) return conf_stage @@ -227,9 +227,9 @@ def fix_diff( answer_path=str( JOJ3_CONFIG_ROOT / task_conf.task.type_ / stdout ), - force_quit_on_diff=diff_output.forcequit, + force_quit_on_diff=diff_output.force_quit, always_hide=diff_output.hide, - compare_space=not diff_output.ignorespaces, + compare_space=not diff_output.ignore_spaces, ).model_dump(by_alias=True) ] } diff --git a/tests/convert/basic/task.json b/tests/convert/basic/task.json index 9800430..a60b95a 100644 --- a/tests/convert/basic/task.json +++ b/tests/convert/basic/task.json @@ -11,7 +11,7 @@ "outputPath": "/tmp/joj3_result.json", "stages": [ { - "name": "healthcheck", + "name": "Health Check", "group": "", "executor": { "name": "local", diff --git a/tests/convert/basic/task.toml b/tests/convert/basic/task.toml index 6c6bf48..6fa8fd3 100644 --- a/tests/convert/basic/task.toml +++ b/tests/convert/basic/task.toml @@ -19,7 +19,7 @@ result-detail.exitstatus = true result-detail.stderr = true result-detail.time = false result-detail.mem = false -result-status.forcequit = true +result-status.force_quit = true [[stages]] name = "[cq] Filelength" @@ -88,7 +88,7 @@ result-detail.stderr = true case0.diff.output.score = 5 case0.limit.cpu = "0.5s" case0.limit.mem = "5m" -case0.diff.output.ignorespaces = true +case0.diff.output.ignore_spaces = true #case0.limit.stdout = 8 #case0.command = "./h7/build/ex2" case0.in = "case0.in" @@ -96,7 +96,7 @@ case0.in = "case0.in" case1.diff.output.score = 5 case1.limit.cpu = 1234567890 case1.limit.mem = 9876543210 -case1.diff.output.ignorespaces = true +case1.diff.output.ignore_spaces = true #case1.limit.stdout = 8 #case1.command = "./h7/build/ex2" case1.in = "case1.in" diff --git a/tests/convert/diff/task.toml b/tests/convert/diff/task.toml index a81f363..ff607dc 100644 --- a/tests/convert/diff/task.toml +++ b/tests/convert/diff/task.toml @@ -19,7 +19,7 @@ result-detail.stderr = true case0.diff.output.score = 5 case0.limit.cpu = "1s" case0.limit.mem = "2m" -case0.diff.output.ignorespaces = true +case0.diff.output.ignore_spaces = true #case0.limit.stdout = 8 #case0.command = "./h7/build/ex2" case0.in = "case0.in" @@ -27,7 +27,7 @@ case0.in = "case0.in" case1.diff.output.score = 5 case1.limit.cpu = "2s" case1.limit.mem = "4m" -case1.diff.output.ignorespaces = true +case1.diff.output.ignore_spaces = true #case1.limit.stdout = 8 #case1.command = "./h7/build/ex2" case1.in = "case1.in"