joj3_config_generator/models/const.py

@@ -6,12 +6,10 @@ DEFAULT_CPU_LIMIT = Time("1s")
 DEFAULT_MEMORY_LIMIT = Memory("256m")
 DEFAULT_FILE_LIMIT = Memory("32m")
 DEFAULT_CASE_SCORE = 5
-DEFAULT_CLOCK_LIMIT_MULTIPLIER = 2
-DEFAULT_PROC_LIMIT = 50
 
 JOJ3_CONFIG_ROOT = Path("/home/tt/.config/joj")
 TEAPOT_CONFIG_ROOT = Path("/home/tt/.config/teapot")
 CACHE_ROOT = Path("/home/tt/.cache")
-JOJ3_LOG_PATH = CACHE_ROOT / "joj3/joj3.log"
+JOJ3_LOG_PATH = CACHE_ROOT / "joj3.log"
 TEAPOT_LOG_PATH = CACHE_ROOT / "joint-teapot-debug.log"
 ACTOR_CSV_PATH = JOJ3_CONFIG_ROOT / "students.csv"

joj3_config_generator/models/result.py

@@ -3,11 +3,9 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 from joj3_config_generator.models.const import (
-    DEFAULT_CLOCK_LIMIT_MULTIPLIER,
     DEFAULT_CPU_LIMIT,
     DEFAULT_FILE_LIMIT,
     DEFAULT_MEMORY_LIMIT,
-    DEFAULT_PROC_LIMIT,
 )
 
 
@@ -51,13 +49,10 @@ class Cmd(BaseModel):
     stdout: Union[Collector, StreamOut] = Collector(name="stdout")
     stderr: Union[Collector, StreamOut] = Collector(name="stderr")
     cpu_limit: int = Field(DEFAULT_CPU_LIMIT, serialization_alias="cpuLimit")
-    clock_limit: int = Field(
+    clock_limit: int = Field(2 * DEFAULT_CPU_LIMIT, serialization_alias="clockLimit")
-        DEFAULT_CLOCK_LIMIT_MULTIPLIER * DEFAULT_CPU_LIMIT,
-        serialization_alias="clockLimit",
-    )
     memory_limit: int = Field(DEFAULT_MEMORY_LIMIT, serialization_alias="memoryLimit")
     stack_limit: int = Field(0, serialization_alias="stackLimit")
-    proc_limit: int = Field(DEFAULT_PROC_LIMIT, serialization_alias="procLimit")
+    proc_limit: int = Field(50, serialization_alias="procLimit")
     cpu_rate_limit: int = Field(0, serialization_alias="cpuRateLimit")
     cpu_set_limit: str = Field("", serialization_alias="cpuSetLimit")
     copy_in: Dict[str, InputFile] = Field({}, serialization_alias="copyIn")

joj3_config_generator/models/task.py

@@ -7,7 +7,6 @@ from pydantic import BaseModel, ConfigDict, Field, field_validator, model_valida
 
 from joj3_config_generator.models.common import Memory, Time
 from joj3_config_generator.models.const import (
-    DEFAULT_CASE_SCORE,
     DEFAULT_CPU_LIMIT,
     DEFAULT_FILE_LIMIT,
     DEFAULT_MEMORY_LIMIT,
@@ -52,7 +51,6 @@ class Outputs(BaseModel):
 
 class ParserDiff(BaseModel):
     output: Outputs = Outputs()
-    default_score: int = DEFAULT_CASE_SCORE
 
 
 class Files(BaseModel):
@@ -127,14 +125,9 @@ class Stage(BaseModel):
     @classmethod
     def gather_cases(cls: Type["Stage"], values: Dict[str, Any]) -> Dict[str, Any]:
         cases = {k: v for k, v in values.items() if k.startswith("case")}
-        limit = values.get("limit", {})
+        for key in cases:
-        parsed_cases = {}
-        for key, case in cases.items():
-            case_with_limit = {**limit, **case.get("limit", {})}
-            case_for_parsing = {**case, "limit": case_with_limit}
-            parsed_cases[key] = case_for_parsing
             values.pop(key)
-        values["cases"] = parsed_cases
+        values["cases"] = {k: v for k, v in cases.items()}
         return values
 
 

joj3_config_generator/transformers/task.py

@@ -4,13 +4,9 @@ from functools import partial
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Set, Tuple
 
-from joj3_config_generator.models import result, task
+from joj3_config_generator.models import const, result, task
 from joj3_config_generator.models.common import Memory, Time
-from joj3_config_generator.models.const import (
+from joj3_config_generator.models.const import JOJ3_CONFIG_ROOT
-    DEFAULT_CLOCK_LIMIT_MULTIPLIER,
-    DEFAULT_PROC_LIMIT,
-    JOJ3_CONFIG_ROOT,
-)
 from joj3_config_generator.models.task import Parser as ParserEnum
 
 
@@ -198,9 +194,9 @@ def fix_diff(
             ),
             args=shlex.split(case_stage.command) if case_stage.command else None,
             cpu_limit=case_stage.limit.cpu,
-            clock_limit=DEFAULT_CLOCK_LIMIT_MULTIPLIER * case_stage.limit.cpu,
+            clock_limit=2 * case_stage.limit.cpu,
             memory_limit=case_stage.limit.mem,
-            proc_limit=DEFAULT_PROC_LIMIT,
+            proc_limit=50,
         )
         if cmd.args == executor.with_.default.args:
             cmd.args = None
@@ -228,17 +224,13 @@ def fix_diff(
         parser_cases.append(parser_case)
     for case in default_cases:
         cmd = result.OptionalCmd(
-            stdin=result.LocalFile(src=str(base_dir / f"{case}.in")),
+            stdin=result.LocalFile(src=str(base_dir / f"{case}.in"))
-            cpu_limit=None,
-            clock_limit=None,
-            memory_limit=None,
-            proc_limit=None,
         )
         stage_cases.append(cmd)
         parser_case = result.DiffCasesConfig(
             outputs=[
                 result.DiffOutputConfig(
-                    score=task_stage.diff.default_score,
+                    score=const.DEFAULT_CASE_SCORE,
                     file_name="stdout",
                     answer_path=str(base_dir / f"{case}.out"),
                 )

plot.py

@@ -1,50 +0,0 @@
-import pandas as pd
-import matplotlib.pyplot as plt
-from sklearn.datasets import load_iris
-
-# 加载Iris数据集并计算平均值
-iris = load_iris()
-df = pd.DataFrame(iris.data, columns=iris.feature_names)
-df['Species'] = [iris.target_names[t] for t in iris.target]
-df_mean = df.groupby('Species').mean().reset_index()
-
-# 数据整理为长格式
-df_melt = df_mean.melt(id_vars='Species', var_name='Measurement', value_name='Average')
-
-# 设置可视化参数
-measurements = ['sepal length (cm)', 'sepal width (cm)', 'petal length (cm)', 'petal width (cm)']
-species = df_mean['Species'].tolist()
-colors = ['#4e79a7', '#f28e2b', '#e15759']  # 专业色盲友好配色
-bar_width = 0.25
-
-# 创建画布
-plt.figure(figsize=(14, 8), dpi=100)
-x = range(len(measurements))
-
-# 绘制分组柱状图
-for i, specie in enumerate(species):
-    offsets = [val + bar_width*i for val in x]
-    values = df_melt[df_melt['Species'] == specie]['Average']
-    plt.bar(offsets, values, width=bar_width, color=colors[i], label=specie, edgecolor='white', linewidth=0.5)
-
-# 添加数据标签
-for i in range(len(measurements)):
-    for j, specie in enumerate(species):
-        value = df_mean.loc[j, measurements[i]]
-        plt.text(x[i] + bar_width*j, value + 0.05, f'{value:.1f}',
-                 ha='center', va='bottom', fontsize=9)
-
-# 图表装饰
-plt.title('Average Sepal and Petal Dimensions by Iris Species', pad=20, fontsize=14, fontweight='bold')
-plt.xlabel('Measurement', labelpad=15, fontsize=12)
-plt.ylabel('Average Dimension (cm)', labelpad=15, fontsize=12)
-plt.xticks([r + bar_width for r in range(len(measurements))], 
-           [m.replace(' (cm)', '').title() for m in measurements], 
-           rotation=45, ha='right')
-plt.ylim(0, df_melt['Average'].max()*1.3)
-plt.grid(axis='y', linestyle='--', alpha=0.4)
-plt.legend(title='Species', bbox_to_anchor=(1.02, 1), loc='upper left')
-
-# 优化布局
-plt.tight_layout()
-plt.show()

tests/convert/diff/task.json

@@ -29,17 +29,17 @@
                             },
                             "stdout": {
                                 "name": "stdout",
-                                "max": 10485760,
+                                "max": 33554432,
                                 "pipe": true
                             },
                             "stderr": {
                                 "name": "stderr",
-                                "max": 10485760,
+                                "max": 33554432,
                                 "pipe": true
                             },
-                            "cpuLimit": 3000000000,
+                            "cpuLimit": 1000000000,
-                            "clockLimit": 6000000000,
+                            "clockLimit": 2000000000,
-                            "memoryLimit": 10485760,
+                            "memoryLimit": 68157440,
                             "stackLimit": 0,
                             "procLimit": 50,
                             "cpuRateLimit": 0,
@@ -71,8 +71,6 @@
                                 "stdin": {
                                     "src": "/home/tt/.config/joj/diff/case0.in"
                                 },
-                                "cpuLimit": 1000000000,
-                                "clockLimit": 2000000000,
                                 "memoryLimit": 2097152
                             },
                             {
@@ -89,22 +87,26 @@
                             {
                                 "stdin": {
                                     "src": "/home/tt/.config/joj/diff/case9.in"
-                                }
+                                },
+                                "memoryLimit": 268435456
                             },
                             {
                                 "stdin": {
                                     "src": "/home/tt/.config/joj/diff/task1/subtask1/case11.in"
-                                }
+                                },
+                                "memoryLimit": 268435456
                             },
                             {
                                 "stdin": {
                                     "src": "/home/tt/.config/joj/diff/task1/subtask1/case10.in"
-                                }
+                                },
+                                "memoryLimit": 268435456
                             },
                             {
                                 "stdin": {
                                     "src": "/home/tt/.config/joj/diff/task1/case5.in"
-                                }
+                                },
+                                "memoryLimit": 268435456
                             },
                             {
                                 "stdin": {
@@ -220,7 +222,7 @@
                                 {
                                     "outputs": [
                                         {
-                                            "score": 100,
+                                            "score": 5,
                                             "fileName": "stdout",
                                             "answerPath": "/home/tt/.config/joj/diff/case2.out",
                                             "forceQuitOnDiff": false,
@@ -232,7 +234,7 @@
                                 {
                                     "outputs": [
                                         {
-                                            "score": 100,
+                                            "score": 5,
                                             "fileName": "stdout",
                                             "answerPath": "/home/tt/.config/joj/diff/case3.out",
                                             "forceQuitOnDiff": false,
@@ -244,7 +246,7 @@
                                 {
                                     "outputs": [
                                         {
-                                            "score": 100,
+                                            "score": 5,
                                             "fileName": "stdout",
                                             "answerPath": "/home/tt/.config/joj/diff/task1/case4.out",
                                             "forceQuitOnDiff": false,
@@ -256,7 +258,7 @@
                                 {
                                     "outputs": [
                                         {
-                                            "score": 100,
+                                            "score": 5,
                                             "fileName": "stdout",
                                             "answerPath": "/home/tt/.config/joj/diff/task2/case6.out",
                                             "forceQuitOnDiff": false,
@@ -268,7 +270,7 @@
                                 {
                                     "outputs": [
                                         {
-                                            "score": 100,
+                                            "score": 5,
                                             "fileName": "stdout",
                                             "answerPath": "/home/tt/.config/joj/diff/task2/case7.out",
                                             "forceQuitOnDiff": false,
@@ -280,7 +282,7 @@
                                 {
                                     "outputs": [
                                         {
-                                            "score": 100,
+                                            "score": 5,
                                             "fileName": "stdout",
                                             "answerPath": "/home/tt/.config/joj/diff/task2/case8.out",
                                             "forceQuitOnDiff": false,

tests/convert/diff/task.toml

@@ -8,17 +8,13 @@ release.begin_time = 2024-12-29 23:59:59+08:00
 name = "[joj] ex2-asan"
 command="./h7/build/ex2-asan -a"
 files.import = [ "h7/build/ex2-asan" ]
-limit.cpu = "3s"
+limit.mem = "65m"
-limit.mem = "10m"
-limit.stdout = "10m"
-limit.stderr = "10m"
 
 parsers = [ "diff", "result-detail" ]
 result-detail.exitstatus = true
 result-detail.stderr = true
 
-diff.default_score = 100
+# will be removed as long as the name is fixed
-
 case0.diff.output.score = 5
 case0.limit.cpu = "1s"
 case0.limit.mem = "2m"
@@ -33,7 +29,6 @@ case1.diff.output.ignore_spaces = true
 case1.command = "./h7/build/ex2"
 
 case9.diff.output.score = 1232131
-case9.limit.mem = "10m"
 
 case11.diff.output.score = 92321