Skip to content

Commit

Permalink
Delete territory__rooms_6 as it is a duplicate of territory__rooms_5
Browse files Browse the repository at this point in the history
See: #246
PiperOrigin-RevId: 707851677
Change-Id: I272dc037b8e50dede332058c785308d6fbee747d
  • Loading branch information
jagapiou authored and copybara-github committed Dec 19, 2024
1 parent 4274362 commit a057515
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
15 changes: 2 additions & 13 deletions meltingpot/configs/scenarios/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
6 changes: 1 addition & 5 deletions meltingpot/configs/scenarios/scenario_configs_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()}
Expand Down

0 comments on commit a057515

Please sign in to comment.