poprawienie wykrywania spacji w automacie

This commit is contained in:
Wojtek 2023-11-25 00:56:48 +01:00
parent 0099fab67f
commit 20251d417f
14 changed files with 59 additions and 31 deletions

View File

@ -24,7 +24,7 @@
0 0 x 0 0 x
0 0 y 0 0 y
0 0 z 0 0 z
0 0 '' 0 0
1 2 a 1 2 a
1 0 b 1 0 b
1 0 c 1 0 c
@ -51,7 +51,7 @@
1 0 x 1 0 x
1 0 y 1 0 y
1 0 z 1 0 z
1 0 '' 1 0
2 0 a 2 0 a
2 0 b 2 0 b
2 0 c 2 0 c
@ -78,7 +78,7 @@
2 0 x 2 0 x
2 0 y 2 0 y
2 0 z 2 0 z
2 0 '' 2 0
3 0 a 3 0 a
3 0 b 3 0 b
3 0 c 3 0 c
@ -105,7 +105,7 @@
3 0 x 3 0 x
3 0 y 3 0 y
3 0 z 3 0 z
3 0 '' 3 0
4 0 a 4 0 a
4 0 b 4 0 b
4 0 c 4 0 c
@ -132,7 +132,7 @@
4 0 x 4 0 x
4 0 y 4 0 y
4 0 z 4 0 z
4 0 '' 4 0
5 0 a 5 0 a
5 0 b 5 0 b
5 0 c 5 0 c
@ -159,7 +159,7 @@
5 0 x 5 0 x
5 0 y 5 0 y
5 0 z 5 0 z
5 0 '' 5 0
6 6 a 6 6 a
6 6 b 6 6 b
6 6 c 6 6 c
@ -186,5 +186,5 @@
6 6 x 6 6 x
6 6 y 6 6 y
6 6 z 6 6 z
6 6 '' 6 6
6 6

View File

@ -10,6 +10,11 @@ def read_aut(fsa_path):
if len(parts) == 1: if len(parts) == 1:
accepting_states.add(int(parts[0])) accepting_states.add(int(parts[0]))
#print(accepting_states) #print(accepting_states)
if len(parts) == 2:
state_from = int(parts[0])
state_to = int(parts[1])
symbol = ' '
transisions[(state_from, symbol)] = state_to
if len(parts) == 3: if len(parts) == 3:
state_from = int(parts[0]) state_from = int(parts[0])
state_to = int(parts[1]) state_to = int(parts[1])

View File

@ -1,4 +1,6 @@
oph elia oph elia
opheelia opheelia
ooooophelia ooooophelia
ooooos ooooophelia

View File

@ -2,3 +2,5 @@ NO
NO NO
NO NO
YES YES
NO
YES

View File

@ -24,7 +24,7 @@
0 0 x 0 0 x
0 0 y 0 0 y
0 0 z 0 0 z
0 0 '' 0 0
1 0 a 1 0 a
1 0 b 1 0 b
1 0 c 1 0 c
@ -51,7 +51,7 @@
1 0 x 1 0 x
1 0 y 1 0 y
1 0 z 1 0 z
1 0 '' 1 0
2 0 a 2 0 a
2 0 b 2 0 b
2 0 c 2 0 c
@ -78,7 +78,7 @@
2 0 x 2 0 x
2 0 y 2 0 y
2 0 z 2 0 z
2 0 '' 2 0
3 0 a 3 0 a
3 0 b 3 0 b
3 0 c 3 0 c
@ -105,7 +105,7 @@
3 0 x 3 0 x
3 0 y 3 0 y
3 0 z 3 0 z
3 0 '' 3 0
4 0 a 4 0 a
4 0 b 4 0 b
4 0 c 4 0 c
@ -132,7 +132,7 @@
4 0 x 4 0 x
4 0 y 4 0 y
4 0 z 4 0 z
4 0 '' 4 0
5 0 a 5 0 a
5 0 b 5 0 b
5 0 c 5 0 c
@ -159,7 +159,7 @@
5 0 x 5 0 x
5 0 y 5 0 y
5 0 z 5 0 z
5 0 '' 5 0
6 7 a 6 7 a
6 0 b 6 0 b
6 0 c 6 0 c
@ -186,7 +186,7 @@
6 0 x 6 0 x
6 0 y 6 0 y
6 0 z 6 0 z
6 0 '' 6 0
7 7 a 7 7 a
7 7 b 7 7 b
7 7 c 7 7 c
@ -213,5 +213,5 @@
7 7 x 7 7 x
7 7 y 7 7 y
7 7 z 7 7 z
7 7 '' 7 7
7 7

View File

@ -10,6 +10,11 @@ def read_aut(fsa_path):
if len(parts) == 1: if len(parts) == 1:
accepting_states.add(int(parts[0])) accepting_states.add(int(parts[0]))
#print(accepting_states) #print(accepting_states)
if len(parts) == 2:
state_from = int(parts[0])
state_to = int(parts[1])
symbol = ' '
transisions[(state_from, symbol)] = state_to
if len(parts) == 3: if len(parts) == 3:
state_from = int(parts[0]) state_from = int(parts[0])
state_to = int(parts[1]) state_to = int(parts[1])

View File

@ -2,3 +2,4 @@ juliet
juuuuliet juliet juuuuliet juliet
ju liet ju liet
jdusadusa juuuu juliet

View File

@ -2,3 +2,4 @@ YES
YES YES
NO NO
NO NO
YES

View File

@ -24,7 +24,7 @@
0 0 x 0 0 x
0 0 y 0 0 y
0 0 z 0 0 z
0 0 '' 0 0
1 0 a 1 0 a
1 0 b 1 0 b
1 0 c 1 0 c
@ -51,7 +51,7 @@
1 0 x 1 0 x
1 0 y 1 0 y
1 0 z 1 0 z
1 0 '' 1 0
2 0 a 2 0 a
2 0 b 2 0 b
2 0 c 2 0 c
@ -78,7 +78,7 @@
2 0 x 2 0 x
2 0 y 2 0 y
2 0 z 2 0 z
2 0 '' 2 0
3 0 a 3 0 a
3 0 b 3 0 b
3 0 c 3 0 c
@ -105,7 +105,7 @@
3 0 x 3 0 x
3 0 y 3 0 y
3 0 z 3 0 z
3 0 '' 3 0
4 0 a 4 0 a
4 0 b 4 0 b
4 0 c 4 0 c
@ -132,7 +132,7 @@
4 0 x 4 0 x
4 0 y 4 0 y
4 0 z 4 0 z
4 0 '' 4 0
5 0 a 5 0 a
5 0 b 5 0 b
5 0 c 5 0 c
@ -159,7 +159,7 @@
5 0 x 5 0 x
5 0 y 5 0 y
5 0 z 5 0 z
5 0 '' 5 0
6 6 a 6 6 a
6 6 b 6 6 b
6 6 c 6 6 c
@ -186,5 +186,5 @@
6 6 x 6 6 x
6 6 y 6 6 y
6 6 z 6 6 z
6 6 '' 6 6
6 6

View File

@ -10,6 +10,11 @@ def read_aut(fsa_path):
if len(parts) == 1: if len(parts) == 1:
accepting_states.add(int(parts[0])) accepting_states.add(int(parts[0]))
#print(accepting_states) #print(accepting_states)
if len(parts) == 2:
state_from = int(parts[0])
state_to = int(parts[1])
symbol = ' '
transisions[(state_from, symbol)] = state_to
if len(parts) == 3: if len(parts) == 3:
state_from = int(parts[0]) state_from = int(parts[0])
state_to = int(parts[1]) state_to = int(parts[1])

View File

@ -6,3 +6,4 @@ a macbeth
mac beth mac beth
m a c beth m a c beth
smacbet h h

View File

@ -6,3 +6,4 @@ NO
NO NO
NO NO
NO NO
NO

View File

@ -24,7 +24,7 @@
0 0 x 0 0 x
0 0 y 0 0 y
0 0 z 0 0 z
0 0 '' 0 0
1 2 a 1 2 a
1 0 b 1 0 b
1 0 c 1 0 c
@ -51,7 +51,7 @@
1 0 x 1 0 x
1 0 y 1 0 y
1 0 z 1 0 z
1 0 '' 1 0
2 0 a 2 0 a
2 0 b 2 0 b
2 3 c 2 3 c
@ -78,7 +78,7 @@
2 0 x 2 0 x
2 0 y 2 0 y
2 0 z 2 0 z
2 0 '' 2 0
3 0 a 3 0 a
3 4 b 3 4 b
3 0 c 3 0 c
@ -105,7 +105,7 @@
3 0 x 3 0 x
3 0 y 3 0 y
3 0 z 3 0 z
3 0 '' 3 0
4 0 a 4 0 a
4 0 b 4 0 b
4 0 c 4 0 c
@ -132,7 +132,7 @@
4 0 x 4 0 x
4 0 y 4 0 y
4 0 z 4 0 z
4 0 '' 4 0
5 0 a 5 0 a
5 0 b 5 0 b
5 0 c 5 0 c
@ -159,7 +159,7 @@
5 0 x 5 0 x
5 0 y 5 0 y
5 0 z 5 0 z
5 0 '' 5 0
6 0 a 6 0 a
6 0 b 6 0 b
6 0 c 6 0 c
@ -186,7 +186,7 @@
6 0 x 6 0 x
6 0 y 6 0 y
6 0 z 6 0 z
6 0 '' 6 0
7 7 a 7 7 a
7 7 b 7 7 b
7 7 c 7 7 c
@ -213,5 +213,5 @@
7 7 x 7 7 x
7 7 y 7 7 y
7 7 z 7 7 z
7 7 '' 7 7
7 7

View File

@ -10,6 +10,11 @@ def read_aut(fsa_path):
if len(parts) == 1: if len(parts) == 1:
accepting_states.add(int(parts[0])) accepting_states.add(int(parts[0]))
#print(accepting_states) #print(accepting_states)
if len(parts) == 2:
state_from = int(parts[0])
state_to = int(parts[1])
symbol = ' '
transisions[(state_from, symbol)] = state_to
if len(parts) == 3: if len(parts) == 3:
state_from = int(parts[0]) state_from = int(parts[0])
state_to = int(parts[1]) state_to = int(parts[1])