Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Рефакторинг #141

Merged
merged 7 commits into from
May 14, 2024
Merged

Рефакторинг #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c0a3bed
Refactoring autotests
KubEF May 5, 2024
abd1ddc
Add fixrtures and signatures
KubEF May 5, 2024
95e4449
Union regexps and put it into separate file
KubEF May 6, 2024
336832b
Rework test for task 4
KubEF May 6, 2024
14b4bc8
Rework grammars constants and add another template
KubEF May 9, 2024
c5f5c4d
Move all regexes to table
KubEF May 10, 2024
b399956
Change any to RecursiveAutomaton
KubEF May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions tests/autotests/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
LABEL: str = "label"
IS_FINAL: str = "is_final"
IS_START: str = "is_start"
REGEXP = "regexp"
CFG = "cfg"
EBNF = "ebnf"

LABELS: list[str] = ["a", "b", "c", "d", "e", "f", "g", "h"]
14 changes: 14 additions & 0 deletions tests/autotests/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import pytest
from helper import generate_rnd_graph, generate_rnd_dense_graph
from networkx import MultiDiGraph
from constants import LABELS
import random

funcs = [generate_rnd_dense_graph, generate_rnd_graph]


@pytest.fixture(scope="function", params=range(8))
KubEF marked this conversation as resolved.
Show resolved Hide resolved
def graph(request) -> MultiDiGraph:
fun = random.choice(funcs)
# task 6 takes a long time if there are ranges [1, 100]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Интересно, почему. По идее, 100 вершин --- ерунда.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Зафиксировал в #144

return fun(1, 40, LABELS)
332 changes: 332 additions & 0 deletions tests/autotests/grammars_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,332 @@
from pyformlang.cfg import cfg
from constants import *

GRAMMARS_TABLE: list[dict[str, list[str | cfg.CFG]]] = [
KubEF marked this conversation as resolved.
Show resolved Hide resolved
{
REGEXP: ["(a | b | c)*(d | e | f)*"],
CFG: [],
EBNF: ["S -> (a | b | c)*(d | e | f)*"],
},
{REGEXP: ["(a b) | (a c)"], CFG: [], EBNF: ["S -> (a b) | (a c)"]},
{REGEXP: ["a b c*"], CFG: [], EBNF: ["S -> a b c*"]},
{REGEXP: ["(a b d) | (a b c)"], CFG: [], EBNF: ["S -> (a b d) | (a b c)"]},
{
REGEXP: ["(a|b|c|d|e)(a|b|c|d|e)*"],
CFG: [],
EBNF: ["S -> (a|b|c|d|e)(a|b|c|d|e)*"],
},
{REGEXP: ["(a|b)*(c|d)*"], CFG: [], EBNF: ["S -> (a|b)*(c|d)*"]},
{REGEXP: ["(a|b|c|d|e)f*"], CFG: [], EBNF: ["S -> (a|b|c|d|e)f*"]},
{REGEXP: ["a a"], CFG: [], EBNF: ["S -> a a"]},
{REGEXP: ["a b*"], CFG: [], EBNF: ["S -> a b*"]},
{REGEXP: ["a b"], CFG: [], EBNF: ["S -> a b"]},
{REGEXP: ["(a b) | (a b c)"], CFG: [], EBNF: ["S -> (a b) | (a b c)"]},
{REGEXP: ["a|c"], CFG: [], EBNF: ["S -> a|c"]},
{REGEXP: ["(a|c)(b|d)"], CFG: [], EBNF: ["S -> (a|c)(b|d)"]},
{REGEXP: ["b"], CFG: [cfg.CFG.from_text("S -> b")], EBNF: ["S -> b"]},
{REGEXP: ["a*a*b"], CFG: [], EBNF: ["S -> a*a*b"]},
{
REGEXP: ["((a | b)*c)*((d | e)*f)*"],
CFG: [],
EBNF: ["S -> ((a | b)*c)*((d | e)*f)*"],
},
{REGEXP: ["((a b d) | (a b c))*"], CFG: [], EBNF: ["S -> ((a b d) | (a b c))*"]},
{REGEXP: ["(a|c)*"], CFG: [], EBNF: ["S -> (a|c)*"]},
{REGEXP: ["(a | c)*(a | b)*"], CFG: [], EBNF: ["S -> (a | c)*(a | b)*"]},
{
REGEXP: ["(a | b)*(c | d)*(e | f)*"],
CFG: [],
EBNF: ["S -> (a | b)*(c | d)*(e | f)*"],
},
{
REGEXP: ["a*(a | b)*", "(a|b)*", "a* | (a | b)*"],
CFG: [],
EBNF: ["S -> a*(a | b)*"],
},
{REGEXP: ["(a b d)* | (a b c)*"], CFG: [], EBNF: ["S -> (a b d)* | (a b c)*"]},
{REGEXP: ["a b* c"], CFG: [], EBNF: ["S -> a b* c"]},
{REGEXP: ["(a a)*"], CFG: [], EBNF: ["S -> (a a)*"]},
{REGEXP: ["((a|b)*c)*"], CFG: [], EBNF: ["S -> ((a|b)*c)*"]},
{REGEXP: ["a b c d"], CFG: [], EBNF: ["S -> a b c d"]},
{
REGEXP: [
"b b b",
],
CFG: [],
EBNF: [
"S -> b b b",
],
},
{REGEXP: ["(a b d*) | (a b c*)"], CFG: [], EBNF: ["S -> (a b d*) | (a b c*)"]},
{
REGEXP: ["a", "a | a"],
CFG: [
cfg.CFG.from_text("S -> a"),
cfg.CFG.from_text(
"""
S -> N B
B -> $
N -> a
"""
),
],
EBNF: ["S -> a"],
},
{
REGEXP: ["a*", "a* a*", "a* | a"],
CFG: [
cfg.CFG.from_text("S -> $ | a S"),
cfg.CFG.from_text("S -> $ | S S | a"),
cfg.CFG.from_text("S -> S a S | $"),
],
EBNF: ["S -> a*"],
},
{
REGEXP: ["a b c"],
CFG: [
cfg.CFG.from_text("S -> a b c"),
cfg.CFG.from_text(
"""
S -> a B
B -> b c
"""
),
],
EBNF: ["S -> a b c"],
},
{
REGEXP: ["a*b*"],
CFG: [
cfg.CFG.from_text(
"""
S -> S1 S2
S2 -> $ | b S2
S1 -> $ | a S1
"""
),
cfg.CFG.from_text(
"""
S -> $ | S1 | a S
S1 -> $ | b S1
"""
),
],
EBNF: ["S -> a*b*"],
},
{
REGEXP: ["(a b)*"],
CFG: [
cfg.CFG.from_text("S -> $ | a b S"),
cfg.CFG.from_text(
"""
S -> $ | S S1
S1 -> a b
"""
),
],
EBNF: ["S -> (a b)*"],
},
{
REGEXP: ["a b*c*"],
CFG: [
cfg.CFG.from_text(
"""
S -> S1 S2 S3
S1 -> a
S2 -> $ | S2 b
S3 -> $ | c S3
"""
),
cfg.CFG.from_text(
"""
S -> a S2 S3
S2 -> S2 b | $
S3 -> c | $ | S3 S3
"""
),
],
EBNF: ["S -> a b*c*"],
},
{
REGEXP: ["(a|b|c|d|e)*"],
CFG: [
cfg.CFG.from_text(
"""
S -> $ | S1 S
S1 -> a | b | c | d | e
"""
),
cfg.CFG.from_text("S -> $ | a | b | c | d | e | S S"),
cfg.CFG.from_text("S -> $ | a S | b S | c S | e S | d S"),
],
EBNF: ["S -> (a|b|c|d|e)*"],
},
{
REGEXP: ["((a | b) * c)*(d | e)"],
CFG: [
cfg.CFG.from_text(
"""
S -> S1 S2
S1 -> S1 S1 | $ | S3 c
S2 -> d | e
S3 -> b S3 | $ | a S3
"""
),
cfg.CFG.from_text(
"""
S -> S1 d | S1 e
S1 -> S1 S3 c | $
S3 -> b S3 | $ | a S3
"""
),
],
EBNF: ["S -> ((a | b) * c)*(d | e)"],
},
{
REGEXP: [],
CFG: [
cfg.CFG.from_text("S -> $ | a S b | S S"),
cfg.CFG.from_text("S -> $ | a S b S"),
cfg.CFG.from_text("S -> $ | S a S b"),
cfg.CFG.from_text("S -> $ | a S b | S S S"),
],
EBNF: ["S -> $ | a S b | S S"],
},
{
REGEXP: [],
CFG: [
cfg.CFG.from_text("S -> $ | a S b | c S d | S S"),
cfg.CFG.from_text("S -> $ | a S b S | c S d S"),
cfg.CFG.from_text("S -> $ | S a S b | S c S d"),
cfg.CFG.from_text("S -> $ | a S b | c S d S | S S S"),
],
EBNF: ["S -> $ | a S b | c S d | S S"],
},
{
REGEXP: [],
CFG: [
cfg.CFG.from_text(
"""
S -> $ | S1 S S2 | S S
S1 -> a | c
S2 -> b | d
"""
),
cfg.CFG.from_text(
"""
S -> $ | S1 S S2 S
S1 -> a | c
S2 -> b | d
"""
),
cfg.CFG.from_text("S -> $ | S a S b | S a S d | S c S d | S c S b"),
cfg.CFG.from_text(
"""
S -> $ | S1 S S2 | S S S
S1 -> a | c
S2-> b | d
"""
),
],
EBNF: ["S -> $ | S a S b | S a S d | S c S d | S c S b"],
},
{
REGEXP: [],
CFG: [
cfg.CFG.from_text(
"""
S -> S S | Se S1 Se
Se -> $ | Se e
S1 -> $ | a S1 b
"""
),
cfg.CFG.from_text(
"""
S -> S1 | S S | e
S1 -> $ | a S1 b
"""
),
cfg.CFG.from_text(
"""
S -> S2 S | $
S2 -> e | S1
S1 -> $ | a S1 b
"""
),
cfg.CFG.from_text(
"""
S -> $ | S1 S | e S
S1 -> $ | a S1 b
"""
),
],
EBNF: [
"""
S -> S1 | S S | e
S1 -> $ | a S1 b
"""
],
},
{
REGEXP: [],
CFG: [
cfg.CFG.from_text("S -> a S | $"),
cfg.CFG.from_text(
"""
S -> S1 | a
S1 -> a S1 | $
"""
),
],
EBNF: ["S -> a S | $"],
},
{
REGEXP: [],
CFG: [
cfg.CFG.from_text(
"""
S -> S1 | S2
S1 -> Sab | S1 c
Sab -> $ | a Sab b
S2 -> Sbc | a S2
Sbc -> $ | b Sbc c
"""
)
],
EBNF: [
"""
S -> ( Sab c* ) | ( a* Sbc ) | $
Sab -> a Sab b | $
Sbc -> b Sbc c | $
"""
],
},
{
REGEXP: [],
CFG: [cfg.CFG.from_text("S -> a | b | S c S | S d S | e S f | g S")],
EBNF: ["S -> a | b | (S ( c | d ) S ) | ( e S f ) | ( g S )"],
},
{
REGEXP: [],
CFG: [
cfg.CFG.from_text(
"S -> $ | a S b | b S a | e S f | S S | c S d | d S c | f S e"
),
],
EBNF: [
"S -> ( ( a S b ) | ( b S a ) | ( c S d ) | ( d S c ) | ( e S f ) | (f S e) )*"
],
},
]

REGEXP_CFG: list[tuple[str, list[cfg.CFG]]] = [
(regexp, ds[CFG]) for ds in GRAMMARS_TABLE for regexp in ds[REGEXP]
]
GRAMMARS: list[list[cfg.CFG]] = [ds[CFG] for ds in GRAMMARS_TABLE if len(ds[CFG]) > 1]
GRAMMARS_DIFFERENT: list[cfg.CFG] = [
ds[CFG][0] for ds in GRAMMARS_TABLE if len(ds[CFG]) >= 1
]
CFG_EBNF: list[tuple[list[cfg.CFG], list[str]]] = [
(ds[CFG], ds[EBNF]) for ds in GRAMMARS_TABLE
]
REGEXES = [regex_str for ds in GRAMMARS_TABLE for regex_str in ds[REGEXP]]
Loading
Loading