s464965/WMICraft
5
2
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'fixed return type' (#30) from hotfix into genetic_alg

Browse Source 
Reviewed-on: #30
This commit is contained in:
Dawid Korzępa 2022-05-31 22:13:46 +02:00
commit d80e83cecf
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
algorithms/genetic/common.py
View File

@ -35,17 +35,19 @@ def dfs(grid: npt.NDArray, visited: Dict[Tuple[int, int], bool], position: Posit
dfs(grid, visited, neighbour, rows, cols) dfs(grid, visited, neighbour, rows, cols)
def count_islands(grid: npt.NDArray, positions: List[Position], rows: int = ROWS, cols: int = COLUMNS) -> int: def get_islands(grid: npt.NDArray, positions: List[Position], rows: int = ROWS, cols: int = COLUMNS) -> List[Position]:
"""it returns list of all islands roots"""
visited = {} visited = {}
for position in positions: for position in positions:
visited[(position.row, position.col)] = False visited[(position.row, position.col)] = False
islands = 0 islands = 0
roots = []
for position in positions: for position in positions:
if not visited[(position.row, position.col)]: if not visited[(position.row, position.col)]:
dfs(grid, visited, position, rows, cols) dfs(grid, visited, position, rows, cols)
roots.append(position)
islands += 1 islands += 1
return islands return roots

5
algorithms/genetic/map_generator.py
View File

@ -1,6 +1,6 @@
from map_importer_exporter import export_map from map_importer_exporter import export_map
from genome import Genome from genome import Genome
from common import count_islands from common import get_islands
def main() -> None: def main() -> None:
@ -8,7 +8,8 @@ def main() -> None:
print(example_genome.knights_red) print(example_genome.knights_red)
print(example_genome.knights_blue) print(example_genome.knights_blue)
print(example_genome.grid) print(example_genome.grid)
print(count_islands(example_genome.grid, example_genome.sands + example_genome.waters)) islands = get_islands(example_genome.grid, example_genome.knights_red)
print(f'Roots {islands} and islands count {len(islands)}')
# export_map(example_genome.grid) fixme: FileNotFoundError # export_map(example_genome.grid) fixme: FileNotFoundError