Remake graph algorithm, add try in CLI
This commit is contained in:
parent
1a44b5c82b
commit
431b414b35
@ -4,8 +4,13 @@ from logics.qr import generate_qr_text
|
|||||||
from logics.generate import alph_generate,pass_generate
|
from logics.generate import alph_generate,pass_generate
|
||||||
|
|
||||||
soglasie=["yes","y","д","да"]
|
soglasie=["yes","y","д","да"]
|
||||||
nigative=["no","n","н","нет"]
|
while True:
|
||||||
|
try:
|
||||||
lineal=int(input("Длина пароля: "))
|
lineal=int(input("Длина пароля: "))
|
||||||
|
break
|
||||||
|
except ValueError:
|
||||||
|
print("Это должно быть число!")
|
||||||
|
while True:
|
||||||
number=input("Использовать числа? [Д/н] ")
|
number=input("Использовать числа? [Д/н] ")
|
||||||
letterB=input("Использовать большие буквы? [Д/н] ")
|
letterB=input("Использовать большие буквы? [Д/н] ")
|
||||||
letterS=input("Использовать маленькие буквы? [Д/н] ")
|
letterS=input("Использовать маленькие буквы? [Д/н] ")
|
||||||
@ -15,9 +20,13 @@ variables=[number.lower(),letterB.lower(),letterS.lower(),spec.lower()]
|
|||||||
for i in range(len(variables)):
|
for i in range(len(variables)):
|
||||||
if variables[i] in soglasie:
|
if variables[i] in soglasie:
|
||||||
variables[i]=True
|
variables[i]=True
|
||||||
if variables[i] in nigative:
|
else:
|
||||||
variables[i]=False
|
variables[i]=False
|
||||||
number,letterB,letterS,spec=variables[0],variables[1],variables[2],variables[3]
|
number,letterB,letterS,spec=variables[0],variables[1],variables[2],variables[3]
|
||||||
|
if True in variables:
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
print("Пустой пароль!")
|
||||||
password_lst=alph_generate(number,letterB,letterS,spec)
|
password_lst=alph_generate(number,letterB,letterS,spec)
|
||||||
password=pass_generate(password_lst,lineal)
|
password=pass_generate(password_lst,lineal)
|
||||||
print(password)
|
print(password)
|
||||||
|
|||||||
@ -8,24 +8,22 @@ def graph(x,y): #Создаём двумерный массив, заполне
|
|||||||
return a
|
return a
|
||||||
|
|
||||||
def ggraph(n,xn,yn):
|
def ggraph(n,xn,yn):
|
||||||
m = 0
|
m = 1
|
||||||
b = graph(xn, yn)
|
b = graph(xn, yn)
|
||||||
av = [[-1,-1]]
|
x0 = 0
|
||||||
masx = [i for i in range(0,xn)]
|
y0 = 0
|
||||||
masy = [i for i in range(0,yn)]
|
from time import time
|
||||||
timing = time.time()
|
timing = time()
|
||||||
while m < n+1:
|
while m < n+1:
|
||||||
x = random.randint(0, xn-1)
|
x = random.randint(0, xn-1)
|
||||||
y = random.randint(0, yn-1)
|
y = random.randint(0, yn-1)
|
||||||
x0 = av[len(av)-1][0]
|
if not((abs(x-x0) == abs(y-y0) and abs(y-y0) != 1)or (y == y0 and abs(x-x0) != 1) or (x == x0 and abs(y-y0) != 1)) and (b[y][x] == 0) or (m == 1):
|
||||||
y0 = av[len(av)-1][1]
|
|
||||||
a = [x0,y0,x,y]
|
|
||||||
if not((abs(x-x0)==abs(y-y0) and abs(y-y0)!=1)or (y==y0 and abs(x-x0)!=1) or (x==x0 and abs(y-y0)!=1)) and x0 in masx and y0 in masy and x in masx and y in masy and (b[y][x] == 0) or (x0==-1 and y0==-1):
|
|
||||||
b[y][x] = m
|
b[y][x] = m
|
||||||
av.append([x,y])
|
x0 = x
|
||||||
|
y0 = y
|
||||||
m += 1
|
m += 1
|
||||||
|
|
||||||
if time.time() - timing > 0.06:
|
if time() - timing > 0.06:
|
||||||
b = None
|
b = None
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
@ -34,6 +32,7 @@ def ggraph(n,xn,yn):
|
|||||||
return b
|
return b
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def find(matrix, value):
|
def find(matrix, value):
|
||||||
value_indexs = [ ( matrix.index(row), row.index(value) ) for row in matrix if value in row]
|
value_indexs = [ ( matrix.index(row), row.index(value) ) for row in matrix if value in row]
|
||||||
return value_indexs
|
return value_indexs
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user