From cce3804bc112ea34ec1b888c9a8336526204eb90 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 17:17:27 +0000 Subject: [PATCH] style: pre-commit fixes --- src/p2lab/genetic/operations.py | 8 ++--- src/p2lab/genetic/utils.py | 2 +- src/p2lab/pokemon/pokefactory.py | 12 +++---- target_api.md | 58 +++++++++++++++++++++----------- 4 files changed, 49 insertions(+), 31 deletions(-) diff --git a/src/p2lab/genetic/operations.py b/src/p2lab/genetic/operations.py index a117fc7..ebf814a 100644 --- a/src/p2lab/genetic/operations.py +++ b/src/p2lab/genetic/operations.py @@ -146,7 +146,7 @@ def locus_swap( team2: list[str], num_pokemon: int, allow_all: bool, - locus: int = None, + locus: int | None = None, ) -> tuple(list[str], list[str]): """ A method of performing the crossover. Pick a 'locus' point: this @@ -194,7 +194,7 @@ def slot_swap( team2: list[str], num_pokemon: int, allow_all: bool, - k: int = None, + k: int | None = None, ) -> tuple(list[str], list[str]): """ A method of performing the crossover. This method randomly @@ -294,7 +294,7 @@ def mutate( mutate_prob: float | np.ndarray, pokemon_population: list[str], allow_all: bool, - k: int = None, + k: int | None = None, ): """ A mutation operation. At random, k members of a team are swapped with k @@ -362,7 +362,7 @@ def fitness_mutate( fitness: np.array, pokemon_population: list[str], allow_all: bool, - k: int = None, + k: int | None = None, ): """ A mutation operation. Does the same as regular mutation, except that diff --git a/src/p2lab/genetic/utils.py b/src/p2lab/genetic/utils.py index fe684da..71656c3 100644 --- a/src/p2lab/genetic/utils.py +++ b/src/p2lab/genetic/utils.py @@ -61,7 +61,7 @@ def crossover( team2_pokemon = team2_old.pokemon # Randomly pick locus - locus = random.sample(range(0, num_pokemon), k=1)[0] + locus = random.sample(range(num_pokemon), k=1)[0] # Check that the sliciing here works but you get the idea team1_new_pokemeon = team1_pokemon[0:locus] + team2_pokemon[locus:num_pokemon] diff --git a/src/p2lab/pokemon/pokefactory.py b/src/p2lab/pokemon/pokefactory.py index 9837e49..96406f8 100644 --- a/src/p2lab/pokemon/pokefactory.py +++ b/src/p2lab/pokemon/pokefactory.py @@ -21,7 +21,7 @@ def __init__(self, gen=1, drop_forms=True): self.dex2mon = { int(self.dex.pokedex[m]["num"]): m for m in self.dex.pokedex - if "forme" not in self.dex.pokedex[m].keys() + if "forme" not in self.dex.pokedex[m] } else: self.dex2mon = { @@ -68,7 +68,7 @@ def make_pokemon(self, dexnum=None, generate_moveset=False, **kwargs): raise ValueError(msg) if dexnum is None: dexnum = np.random.choice(list(self.dex2mon.keys())) - if generate_moveset or "moves" not in kwargs.keys(): + if generate_moveset or "moves" not in kwargs: poss_moves = self.get_allowed_moves(dexnum) moves = ( np.random.choice(poss_moves, 4, replace=False) @@ -76,16 +76,16 @@ def make_pokemon(self, dexnum=None, generate_moveset=False, **kwargs): else poss_moves ) kwargs["moves"] = moves - if "ivs" not in kwargs.keys(): + if "ivs" not in kwargs: ivs = [31] * 6 kwargs["ivs"] = ivs - if "evs" not in kwargs.keys(): + if "evs" not in kwargs: # TODO: implement EV generation better evs = [510 // 6] * 6 kwargs["evs"] = evs - if "level" not in kwargs.keys(): + if "level" not in kwargs: kwargs["level"] = 100 - if "ability" not in kwargs.keys(): + if "ability" not in kwargs: kwargs["ability"] = np.random.choice( list(self.get_allowed_abilities(dexnum).values()) ) diff --git a/target_api.md b/target_api.md index 2884acd..1563888 100644 --- a/target_api.md +++ b/target_api.md @@ -7,8 +7,7 @@ running genetic algorithms to optimize teams. Thank you to github copilot for helping me write this document lmao ```python3 - -team = generate_team(format='gen8randombattle', seed=1234) +team = generate_team(format="gen8randombattle", seed=1234) # a team object contains a list of 6 pokemon objects with their moves, items, etc. # it's also tracking the (normalised) number of wins/losses/ties for this team. @@ -30,12 +29,12 @@ team = generate_team(format='gen8randombattle', seed=1234) # here's an idealised Bot class that uses these same env variables to run a showdown bot, but more cleanly: bot_1 = Bot( team, - strategy='safest', - websocket_uri='sim.psim.us:8000', - user='whimsicaldreams', - password='password', - bot_mode='CHALLENGE_USER', - format='gen3ou', + strategy="safest", + websocket_uri="sim.psim.us:8000", + user="whimsicaldreams", + password="password", + bot_mode="CHALLENGE_USER", + format="gen3ou", num_battles=1, save_replay=False, ) @@ -47,18 +46,19 @@ bot_1 = Bot( # now we can run a battle between two bots: bot_2 = Bot( team, - strategy='safest', - websocket_uri='sim.psim.us:8000', - user='melonchomper', - password='password', - bot_mode='CHALLENGE_USER', # this would need to be ACCEPT_CHALLENGE - format='gen3ou', + strategy="safest", + websocket_uri="sim.psim.us:8000", + user="melonchomper", + password="password", + bot_mode="CHALLENGE_USER", # this would need to be ACCEPT_CHALLENGE + format="gen3ou", num_battles=1, save_replay=False, ) # from a little google searching, it looks like we can run these bots in parallel using asyncio: + async def run_battle(bot_1, bot_2): # individually run the showdown bots at the same time, and wait for the results await asyncio.gather(bot_1.challenge(bot_2), bot_2.accept(bot_1)) @@ -66,6 +66,7 @@ async def run_battle(bot_1, bot_2): # update the win/loss/tie counts for each team ... + run_battle(bot_1, bot_2) # within this function, we'll need to: @@ -74,7 +75,20 @@ run_battle(bot_1, bot_2) # - update the win/loss/tie counts for each team # here's a more generic example, where we specify a number of battles for each team, and then run them all: -bots = {f'bot{i}':Bot(team, strategy='safest', websocket_uri='sim.psim.us:8000', user=f'bot{i}', password='password', bot_mode='CHALLENGE_USER' if i % 2 == 0 else 'ACCEPT_CHALLENGE', format='gen3ou', num_battles=10, save_replay=False) for i in range(10)} +bots = { + f"bot{i}": Bot( + team, + strategy="safest", + websocket_uri="sim.psim.us:8000", + user=f"bot{i}", + password="password", + bot_mode="CHALLENGE_USER" if i % 2 == 0 else "ACCEPT_CHALLENGE", + format="gen3ou", + num_battles=10, + save_replay=False, + ) + for i in range(10) +} # num_battles = 10 would mean that bot would challenge the same bot 10 times, so we can make every bot fight every other bot 10 times @@ -85,14 +99,18 @@ for bot_1, bot_2 in itertools.combinations(bots.values(), 2): if bot_1 != bot_2: try: # make sure bot_1 is the challenger and bot_2 is the acceptor - bot_1.bot_mode = 'CHALLENGE_USER' - bot_2.bot_mode = 'ACCEPT_CHALLENGE' + bot_1.bot_mode = "CHALLENGE_USER" + bot_2.bot_mode = "ACCEPT_CHALLENGE" # check if either bot is currently in a battle if bot_1.in_battle or bot_2.in_battle: - print(f'Bot {bot_1} or {bot_2} is currently in a battle, waiting for them to finish...') + print( + f"Bot {bot_1} or {bot_2} is currently in a battle, waiting for them to finish..." + ) while bot_1.in_battle or bot_2.in_battle: - await asyncio.sleep(1) # hopefully this will wait for the battle to finish + await asyncio.sleep( + 1 + ) # hopefully this will wait for the battle to finish # run the battle bot_1.in_battle = True @@ -105,7 +123,7 @@ for bot_1, bot_2 in itertools.combinations(bots.values(), 2): except Exception as e: print(e) - print(f'Error running battle between {bot_1} and {bot_2}') + print(f"Error running battle between {bot_1} and {bot_2}") # ensure we're only here once every bot has fought every other bot while any(bot.in_battle for bot in bots.values()):