partage/lcm-crossword-generator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a bug where words could be repeated in the grid.

Browse source
This commit is contained in:
Gonçalo S. Martins 2016-05-18 17:35:38 +01:00
parent c89d8dd0bd
commit a3b68a2b22
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crossword_generator.py
View file

@ -129,7 +129,7 @@ def draw_words(words, n_words=100):
else:
while len(selected_words) < n_words:
# Choose candidate randomly
candidate = words[random.randint(0, len(words)-1)]
candidate = words.pop(random.randint(0, len(words)-1))
# Append candidate if it's not already there
if candidate not in selected_words:
selected_words.append(candidate)
@ -198,7 +198,7 @@ def generate_grid(words, dim):
# Fill in grid
occupancy = 0
while occupancy < 0.75:
while occupancy < 0.6:
# Generate new possibilities, if needed
if not possibilities:
print("Getting new words!")
@ -224,7 +224,7 @@ def generate_grid(words, dim):
# (we're reading the list backwards, I'd like to replace this with a
# comprehension)
for i in range(len(possibilities)-1, -1, -1):
if not is_valid(possibilities[i], grid):
if not is_valid(possibilities[i], grid) or possibilities[i]["word"] == new["word"]:
possibilities.pop(i)