Skip to content

fixing an iteration issue #16

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.

Sign up for GitHub

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

Open
kmanc wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fixing an iteration issue #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
727c447
fixing an iteration issue
kmanc Sep 10, 2017
c6d93b3
adding stubs for new api capabilities
kmanc Sep 11, 2017
0c8cb7f
prepping for new data made available by the api. just need to borrow …
kmanc Sep 11, 2017
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
9 changes: 5 additions & 4 deletions app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ def gather_info(summoners, champ_count, champ_id_to_name, region):
summoner_id, summoner_name, account_id = get_data.get_summoner_data(player, region)
champ_points_pair = get_data.get_summoners_mastery(summoner_id, summoner_name, champ_count, region)
champ_counters = get_data.lanes_and_roles(account_id, summoner_name, champ_points_pair, champ_id_to_name, region)
get_data.percentages(champ_counters)
champ_counters, total_games = get_data.percentages(champ_counters)
summoner_data[summoner_name] = get_data.data_compile(summoner_name, champ_counters,
champ_id_to_name, champ_points_pair)
champ_id_to_name, champ_points_pair, total_games)

return summoner_data

Expand All @@ -203,6 +203,7 @@ def build_team(summoner_data, picked_list, banned_list, generation_size):
population = do_math.mutate(population, summoner_data, picked_list, banned_list)
new_health = do_math.grade_generation(population)

dream_team = population[0]
sorted_end = [(do_math.fitness(candidate), candidate) for candidate in population]
sorted_end = [team_tuple[1] for team_tuple in sorted(sorted_end, reverse=True)]

return dream_team
return sorted_end[0]
26 changes: 14 additions & 12 deletions get_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ def lanes_and_roles(account_id, summoner_name, champ_points_pair, champ_id_to_na
try:
list_of_games = lane_response['matches']
for game in list_of_games:
# Skip TT games
if game['queue'] == 41:
# Skip non-SR games
if game['queue'] not in [2, 14, 4, 6, 42, 400, 410, 420, 430, 440]:
continue
champ_id = game['champion']
if 'lane' in game:
Expand Down Expand Up @@ -103,20 +103,22 @@ def percentages(champ_counters):
# Get percentage of games played in each role per champion (eg 33% top, 50% jungle, 17% support)
# Bonus points if you can tell us what champions might fit that above percentage distribution

total_games = dict()
for id_key, count_dict in champ_counters.items():
role_games = 0
for role_name, role_count in count_dict.items():
role_games += role_count
for role_name, role_count in count_dict.items():
if role_games > 0:
champ_counters[id_key][role_name] /= float(role_games)
champ_games = 0
for role_count in count_dict.values():
champ_games += role_count
for role_name in count_dict.keys():
if champ_games > 0:
champ_counters[id_key][role_name] /= float(champ_games)
else:
champ_counters[id_key][role_name] /= float(1)
champ_counters[id_key][role_name] = 0
total_games[id_key] = champ_games

return champ_counters
return champ_counters, total_games


def data_compile(summoner_name, champ_counters, champ_id_to_name, champ_points_pair):
def data_compile(summoner_name, champ_counters, champ_id_to_name, champ_points_pair, total_games):
# Compile all the data that we have pulled so far into one place
structured_data = []

Expand All @@ -136,7 +138,7 @@ def data_compile(summoner_name, champ_counters, champ_id_to_name, champ_points_p
if role.upper() not in ['DUO_CARRY', 'DUO_SUPPORT', 'JUNGLE', 'MID', 'TOP']:
continue
name = champ_id_to_name[str(champ_id)]
points = int(percentage * multiplier * champ_points_pair[champ_id])
points = int((percentage * multiplier * champ_points_pair[champ_id]) / total_games[champ_id])
champ_tuple = Champ(name, champ_id, role, points, summoner_name)
structured_data.append(champ_tuple)

Expand Down