From a05751514ebc67d8650bf299734aa83775adaa4d Mon Sep 17 00:00:00 2001 From: John Agapiou Date: Thu, 19 Dec 2024 03:21:09 -0800 Subject: [PATCH] Delete territory__rooms_6 as it is a duplicate of territory__rooms_5 See: https://github.com/google-deepmind/meltingpot/issues/246 PiperOrigin-RevId: 707851677 Change-Id: I272dc037b8e50dede332058c785308d6fbee747d --- meltingpot/configs/scenarios/__init__.py | 15 ++------------- .../configs/scenarios/scenario_configs_test.py | 6 +----- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/meltingpot/configs/scenarios/__init__.py b/meltingpot/configs/scenarios/__init__.py index d77bdb21..3a68de4b 100644 --- a/meltingpot/configs/scenarios/__init__.py +++ b/meltingpot/configs/scenarios/__init__.py @@ -5036,19 +5036,8 @@ def __post_init__(self): 'default': {'territory__rooms__puppet_considerate_claimer_0'} }, ), - territory__rooms_6=ScenarioConfig( - description=('focals are resident, visited by a couple considerate ' + - 'claimers'), - tags={ - 'resident', - }, - substrate='territory__rooms', - roles=('default',) * 9, - is_focal=(True,) * 7 + (False,) * 2, - bots_by_role={ - 'default': {'territory__rooms__puppet_considerate_claimer_0'} - }, - ), + # territory__rooms_6 deleted due to + # https://github.com/google-deepmind/meltingpot/issues/246. territory__rooms_7=ScenarioConfig( description=('focals are resident, visited by an inconsiderate ' + 'claimer'), diff --git a/meltingpot/configs/scenarios/scenario_configs_test.py b/meltingpot/configs/scenarios/scenario_configs_test.py index 72e0662d..1aa08a6e 100644 --- a/meltingpot/configs/scenarios/scenario_configs_test.py +++ b/meltingpot/configs/scenarios/scenario_configs_test.py @@ -108,11 +108,7 @@ def test_no_duplicates(self): for name, config in SCENARIO_CONFIGS.items(): seen[config].add(name) duplicates = tuple(names for _, names in seen.items() if len(names) > 1) - self.assertEqual(duplicates, - tuple([{'territory__rooms_5', 'territory__rooms_6'}]), - 'The only acceptable duplicates are territory__rooms_5 ' - f'and territory__rooms_6. Found: {duplicates!r}.') - # self.assertEmpty(duplicates, f'Duplicate configs found: {duplicates!r}.') + self.assertEmpty(duplicates, f'Duplicate configs found: {duplicates!r}.') def test_all_substrates_used_by_scenarios(self): used = {scenario.substrate for scenario in SCENARIO_CONFIGS.values()}