adrien/mots-croises
adrien/mots-croises
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '6da441e9df100a97242403e410bc6aa468c1322d'

Browse Source
This commit is contained in:
Adrien MALINGREY 2025-04-24 10:58:21 +02:00
commit d730b9a26a
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
test1.py
View File

@ -23,7 +23,7 @@ def mots_espaces(n):
# for mot in mots_de_n_lettres[n-1]: # for mot in mots_de_n_lettres[n-1]:
# yield f"{mot} " # yield f"{mot} "
# yield f" {mot}" # yield f" {mot}"
for i in range(2, ceil(n / 2)): for i in range(1, ceil(n / 2)):
for mot1, mot2 in product(mots_de_n_lettres[i], mots_espaces(n - i - 1)): for mot1, mot2 in product(mots_de_n_lettres[i], mots_espaces(n - i - 1)):
yield f"{mot1} {mot2}" yield f"{mot1} {mot2}"
yield f"{mot2} {mot1}" yield f"{mot2} {mot1}"
@ -40,7 +40,7 @@ class Ligne:
self.grille = grille self.grille = grille
def __getitem__(self, n): def __getitem__(self, n):
return "".join(self.grille[n][:n]) return "".join(self.grille[n])
def __setitem__(self, n, mot): def __setitem__(self, n, mot):
self.grille[n] = list(mot) self.grille[n] = list(mot)
@ -51,7 +51,7 @@ class Colonne:
self.grille = grille self.grille = grille
def __getitem__(self, n): def __getitem__(self, n):
return "".join(ligne[n] for ligne in self.grille[:n+1]) return "".join(ligne[n] for ligne in self.grille)
def __setitem__(self, n, mot): def __setitem__(self, n, mot):
for i, char in enumerate(mot): for i, char in enumerate(mot):
@ -66,11 +66,11 @@ class Grille:
self.ligne = Ligne(self.grille) self.ligne = Ligne(self.grille)
self.colonne = Colonne(self.grille) self.colonne = Colonne(self.grille)
self.mot_commencant_par = defaultdict(lambda: defaultdict(list)) self.mots_commencant_par = defaultdict(lambda: defaultdict(list))
for dimension in (hauteur,) if hauteur == largeur else (hauteur, largeur): for dimension in (hauteur,) if hauteur == largeur else (hauteur, largeur):
for mot in mots_espaces(dimension): for mot in mots_espaces(dimension):
for i in range(dimension+1): for i in range(dimension+1):
self.mot_commencant_par[dimension][mot[:i]].append(mot) self.mots_commencant_par[dimension][mot[:i]].append(mot)
self.grilles = self.genere_grilles() self.grilles = self.genere_grilles()
next(self.grilles) next(self.grilles)
@ -85,25 +85,33 @@ class Grille:
print(f"Grille({self.hauteur}, {self.largeur})") print(f"Grille({self.hauteur}, {self.largeur})")
yield from self.trouve_une_ligne(0) yield from self.trouve_une_ligne(0)
def trouve_une_ligne(self, i): def trouve_une_ligne(self, l):
for mot in self.mot_commencant_par[self.largeur][self.ligne[i]]: for mot in self.mots_commencant_par[self.largeur][self.ligne[l][:l]]:
self.ligne[i] = mot self.ligne[l] = mot
if i < self.largeur: if all(
yield from self.trouve_une_colonne(i) self.colonne[c][:l+1] in self.mots_commencant_par[self.hauteur]
elif i + 1 < self.hauteur: for c in range(l, self.largeur)
yield from self.trouve_une_ligne(i + 1) ):
else: if l < self.largeur:
yield self yield from self.trouve_une_colonne(l)
elif l + 1 < self.hauteur:
yield from self.trouve_une_ligne(l + 1)
else:
yield self
def trouve_une_colonne(self, i): def trouve_une_colonne(self, c):
for mot in self.mot_commencant_par[self.hauteur][self.colonne[i]]: for mot in self.mots_commencant_par[self.hauteur][self.colonne[c][:c+1]]:
self.colonne[i] = mot self.colonne[c] = mot
if i + 1 < self.hauteur: if all(
yield from self.trouve_une_ligne(i + 1) self.ligne[l][:c+1] in self.mots_commencant_par[self.largeur]
elif i + 1 < self.largeur: for l in range(c, self.largeur)
yield from self.trouve_une_colonne(i + 1) ):
else: if c + 1 < self.hauteur:
yield self yield from self.trouve_une_ligne(c + 1)
elif c + 1 < self.largeur:
yield from self.trouve_une_colonne(c + 1)
else:
yield self
def __str__(self): def __str__(self):
return ( return (
@ -131,5 +139,6 @@ if __name__ == "__main__":
end = time.time() end = time.time()
print(f"Execution time: {end - self.start:.2f} seconds") print(f"Execution time: {end - self.start:.2f} seconds")
with Timer(): for n in range(2, 14):
print(Grille(6, 6)) with Timer():
print(Grille(n, n))