Merge branch 'master' of https://codefirst.iut.uca.fr/git/nathan.boileau/Scripted

EnigmePython/cryptarithme.py

@@ -58,10 +58,12 @@ def cryptarithmeGenerique (s):
 	# print(ListeOperateurs)
 
 	# associe à une lettre ses possibilités
-
 	for i in range(0,len(lettres)):
+		if(lettres[i] in [ListeMots[y][0] for y in range(0,len(ListeMots))]):
+			ListeLettres.append([lettres[i],intvar(1,9, shape=1)])
+		else:
 			ListeLettres.append([lettres[i],intvar(0,9, shape=1)])
-	# print(ListeLettres)
+	#print(ListeLettres)
 
 	# associe pour chaque mot une liste des positions des variables contenu dans ListeLettres
 
@@ -98,13 +100,14 @@ def cryptarithmeGenerique (s):
 	BigFirstEquationConstraintPart=ConstraintAssemblingList[0]
 	for i in range(0,len(ListeOperateurs)):
 		if(ListeOperateurs[i]=='+'):
-			BigFirstEquationConstraintPart = BigFirstEquationConstraintPart + [ConstraintAssemblingList[i+1]]
+			BigFirstEquationConstraintPart = BigFirstEquationConstraintPart + ConstraintAssemblingList[i+1]
 		if(ListeOperateurs[i]=='-'):
-			BigFirstEquationConstraintPart = BigFirstEquationConstraintPart - [ConstraintAssemblingList[i+1]]
+			BigFirstEquationConstraintPart = BigFirstEquationConstraintPart - ConstraintAssemblingList[i+1]
 		if(ListeOperateurs[i]=='*'):
-			BigFirstEquationConstraintPart = BigFirstEquationConstraintPart * [ConstraintAssemblingList[i+1]]
+			BigFirstEquationConstraintPart = BigFirstEquationConstraintPart * ConstraintAssemblingList[i+1]
 		if(ListeOperateurs[i]=='/'):
-			BigFirstEquationConstraintPart = BigFirstEquationConstraintPart / [ConstraintAssemblingList[i+1]]
+			BigFirstEquationConstraintPart = BigFirstEquationConstraintPart / ConstraintAssemblingList[i+1]
+			print(BigFirstEquationConstraintPart)
 		if(ListeOperateurs[i]=='='):
 			equalposition=i
 			break
@@ -115,13 +118,14 @@ def cryptarithmeGenerique (s):
 	BigSecondEquationConstraintPart=ConstraintAssemblingList[equalposition+1]
 	for i in range(equalposition,len(ListeOperateurs)):
 		if(ListeOperateurs[i]=='+'):
-			BigSecondEquationConstraintPart = BigSecondEquationConstraintPart + [ConstraintAssemblingList[i+1]]
+			BigSecondEquationConstraintPart = BigSecondEquationConstraintPart + ConstraintAssemblingList[i+1]
 		if(ListeOperateurs[i]=='-'):
-			BigSecondEquationConstraintPart = BigSecondEquationConstraintPart - [ConstraintAssemblingList[i+1]]
+			BigSecondEquationConstraintPart = BigSecondEquationConstraintPart + -ConstraintAssemblingList[i+1]
 		if(ListeOperateurs[i]=='*'):
-			BigSecondEquationConstraintPart = BigSecondEquationConstraintPart * [ConstraintAssemblingList[i+1]]
+			BigSecondEquationConstraintPart = BigSecondEquationConstraintPart * ConstraintAssemblingList[i+1]
 		if(ListeOperateurs[i]=='/'):
-			BigSecondEquationConstraintPart = BigSecondEquationConstraintPart / [ConstraintAssemblingList[i+1]]
+			BigSecondEquationConstraintPart = BigSecondEquationConstraintPart / ConstraintAssemblingList[i+1]
+			print(BigSecondEquationConstraintPart)
 	# print(BigSecondEquationConstraintPart)
 
 	# Création du model et de ses contraintes
@@ -149,6 +153,9 @@ def cryptarithmeGenerique (s):
 	else:
 		print("No solution found")
 	
-cryptarithmeGenerique("SEND + MORE = MONEY");
+cryptarithmeGenerique("SEND + MORE = MONEY")
-cryptarithmeGenerique("HUIT + HUIT = SEIZE");
+cryptarithmeGenerique("HUIT + HUIT = SEIZE")
-cryptarithmeGenerique("UN + UN + NEUF = ONZE");
+cryptarithmeGenerique("UN + UN + NEUF = ONZE")
+cryptarithmeGenerique("UN + TROIS - NEUF = ONZE")
+cryptarithmeGenerique("UN * UN = ONZE")
+cryptarithmeGenerique("UNN / UN = UN")