Skip to content
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
6 changes: 3 additions & 3 deletions server/ladder_service/ladder_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -574,20 +574,20 @@ def get_displayed_rating(player: Player) -> float:
raise RuntimeError(f"No map pool available for rating {rating}!")

self._logger.debug(
"______queue.map_pools[map_pool.id]________________: %s",
"queue.map_pools[map_pool.id]: %s",
queue.map_pools[map_pool.id],
)
initial_weights = self.veto_service.generate_initial_weights_for_match(
all_players,
queue.map_pools[map_pool.id],
)
self._logger.debug(
"______initial_weights________________: %s",
"initial_weights: %s",
initial_weights,
)
game_map = map_pool.choose_map(played_map_ids, initial_weights)

self._logger.debug("______game_map________________: %s", game_map)
self._logger.debug("game_map: %s", game_map)

game = self.game_service.create_game(
game_class=LadderGame,
Expand Down
2 changes: 1 addition & 1 deletion server/ladder_service/veto_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def generate_initial_weights_for_match(
bracket_vetoes = player.vetoes.get_vetoes_for_bracket(pool_id)
vetoes_map[m.map_pool_map_version_id] += bracket_vetoes.get(m.map_pool_map_version_id, 0)

self._logger.debug("______vetoes_map________________: %s", vetoes_map)
self._logger.debug("vetoes_map: %s", vetoes_map)

if max_tokens_per_map == 0:
max_tokens_per_map = self.calculate_dynamic_tokens_per_map(minimum_maps_after_veto, vetoes_map.values())
Expand Down
10 changes: 5 additions & 5 deletions server/matchmaker/map_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ def choose_map(self, played_map_ids: Iterable[int] = (), initial_weights: Option
self._logger.critical("Trying to choose a map from an empty map pool: %s", self.name)
raise RuntimeError(f"Map pool {self.name} not set!")

self._logger.debug("______initial_played_map_ids___________: %s", list(played_map_ids))
self._logger.debug("initial_played_map_ids: %s", list(played_map_ids))
played_map_pool_map_version_ids = [
self.maps[id].map_pool_map_version_id
for id in played_map_ids
if id in self.maps
]
self._logger.debug("______played_map_pool_map_version_ids_________: %s", played_map_pool_map_version_ids)
self._logger.debug("played_map_pool_map_version_ids: %s", played_map_pool_map_version_ids)

map_list = [(m.map_pool_map_version_id, m) for m in self.maps.values()]

Expand All @@ -101,10 +101,10 @@ def choose_map(self, played_map_ids: Iterable[int] = (), initial_weights: Option
adjusted_weights = self.apply_antirepetition_adjustment(
initial_weights, played_map_pool_map_version_ids, config.LADDER_ANTI_REPETITION_WEIGHT_BASE_THRESHOLDS, config.LADDER_ANTI_REPETITION_REPEAT_COUNTS_FACTOR
)
self._logger.debug("______adjusted_weights________________: %s", adjusted_weights)
self._logger.debug("______map_list________________: %s", map_list)
self._logger.debug("adjusted_weights: %s", adjusted_weights)
self._logger.debug("map_list: %s", map_list)
final_weights = [adjusted_weights.get(mp_mv_id, 0) * m.weight for mp_mv_id, m in map_list]
self._logger.debug("______final_weights________________: %s", final_weights)
self._logger.debug("final_weights: %s", final_weights)
return random.choices([map for _, map in map_list], weights=final_weights, k=1)[0].get_map() # nosec B311

def __repr__(self) -> str:
Expand Down