diff --git a/src/scml/utils.py b/src/scml/utils.py index ae4d24b0..c6595f26 100755 --- a/src/scml/utils.py +++ b/src/scml/utils.py @@ -1,6 +1,7 @@ from __future__ import annotations import copy +from pathlib import Path from collections import defaultdict from functools import partial from itertools import chain @@ -1162,7 +1163,7 @@ def anac2020_tournament( n_runs_per_world: int = 2, n_agents_per_competitor: int = 3, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -1250,7 +1251,7 @@ def anac2020_std( max_worlds_per_config: int | None = None, n_runs_per_world: int = 1, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -1378,7 +1379,7 @@ def anac2020_collusion( n_runs_per_world: int = 1, n_agents_per_competitor: int = 3, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -1506,7 +1507,7 @@ def anac2021_tournament( n_runs_per_world: int = 2, n_agents_per_competitor: int = 3, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -1594,7 +1595,7 @@ def anac2021_std( max_worlds_per_config: int | None = None, n_runs_per_world: int = 1, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -1724,7 +1725,7 @@ def anac2021_collusion( n_runs_per_world: int = 1, n_agents_per_competitor: int = 3, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -1852,7 +1853,7 @@ def anac2021_oneshot( max_worlds_per_config: int | None = None, n_runs_per_world: int = 1, min_factories_per_level: int = 4, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -1988,7 +1989,7 @@ def anac2022_tournament( n_runs_per_world: int = 2, n_agents_per_competitor: int = 3, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -2076,7 +2077,7 @@ def anac2022_std( max_worlds_per_config: int | None = None, n_runs_per_world: int = 1, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -2206,7 +2207,7 @@ def anac2022_collusion( n_runs_per_world: int = 1, n_agents_per_competitor: int = 3, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -2334,7 +2335,7 @@ def anac2022_oneshot( max_worlds_per_config: int | None = None, n_runs_per_world: int = 1, min_factories_per_level: int = 4, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -2432,7 +2433,7 @@ def anac2023_tournament( n_runs_per_world: int = 2, n_agents_per_competitor: int = 3, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -2521,7 +2522,7 @@ def anac2023_collusion( n_runs_per_world: int = 1, n_agents_per_competitor: int = 3, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -2649,7 +2650,7 @@ def anac2023_std( max_worlds_per_config: int | None = None, n_runs_per_world: int = 1, min_factories_per_level: int = 2, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -2778,7 +2779,7 @@ def anac2023_oneshot( max_worlds_per_config: int | None = None, n_runs_per_world: int = 1, min_factories_per_level: int = 4, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -2914,7 +2915,7 @@ def anac2024_std( max_worlds_per_config: int | None = None, n_runs_per_world: int = 1, min_factories_per_level: int = 4, - tournament_path: str | None = None, + tournament_path: str | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None, @@ -3050,7 +3051,7 @@ def anac2024_oneshot( max_worlds_per_config: int | None = None, n_runs_per_world: int = 1, min_factories_per_level: int = 4, - tournament_path: str | None = None, + tournament_path: str | Path | Path | None = None, total_timeout: int | None = None, parallelism="parallel", scheduler_ip: str | None = None,