Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post hack week refactor! #32

Merged
merged 8 commits into from
Jun 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@
import numpy as np
from poke_env import PlayerConfiguration
from poke_env.player import SimpleHeuristicsPlayer
from run import generate_gen_1_teams, import_pool, run_battles

from p2lab.gen_data import gen_1_pokemon
from p2lab.pokemon.battles import run_battles
from p2lab.pokemon.premade import gen_1_pokemon
from p2lab.pokemon.teams import generate_teams, import_pool

if TYPE_CHECKING:
from p2lab.team import Team
from p2lab.pokemon.teams import Team

# Actual code ==========================================================================

Expand All @@ -37,7 +38,7 @@ def gen_pop() -> list[Team]:
in this script, but I will simplify away from that for now.
"""
pool = import_pool(team_string=gen_1_pokemon())
return generate_gen_1_teams(pool)
return generate_teams(pool, num_teams=151, team_size=1, unique=True)


async def duel(poke_1, poke_2, player_1, player_2) -> bool:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ RUN apt-get upgrade
RUN apt-get install nodejs npm -y

ENV ROOT_DIR=/home
ENV P2_PATH=$ROOT_DIR/P2-Lab
ENV P2_PATH=$ROOT_DIR/p2lab-pokemon

RUN git clone https://github.com/alan-turing-institute/P2-Lab $P2_PATH
RUN git clone https://github.com/alan-turing-institute/p2lab-pokemon $P2_PATH
RUN git clone https://github.com/smogon/pokemon-showdown $P2_PATH/pokemon-showdown
RUN git clone https://github.com/AoifeHughes/poke-env $P2_PATH/poke_env
RUN git clone https://github.com/phinate/showdown $P2_PATH/showdown

RUN python3 -m venv $P2_PATH/venv-pokemon
RUN pip install --upgrade pip setuptools wheel
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# P2-Lab
<p align="center">
<img width="30%" alt="relaxed logo" src=assets/logo.png><br>
<br>
<a href="https://github.com/alan-turing-institute/p2lab-pokemon/actions">
<img alt="GitHub Workflow Status" src="https://github.com/alan-turing-institute/p2lab-pokemon/workflows/CI/badge.svg">
</a>
</p>

An interface for optimising pokemon teams using genetic algorithms!

Expand Down
554 changes: 0 additions & 554 deletions analysis/team_gen_analysis.ipynb

This file was deleted.

Binary file added assets/logo.png
Empty file removed poke_stats/__init__.py
Empty file.
29 changes: 0 additions & 29 deletions poke_stats/delete_pngs.py

This file was deleted.

377 changes: 0 additions & 377 deletions poke_stats/poke_stats.ipynb

This file was deleted.

Loading