Recursive Automaton (RSM), CFG in Extended Backus-Naur Form, RPQ algorithm by AlexShmak · Pull Request #34 · spbu-se/KotlinAutomataConstructor

AlexShmak · 2025-10-01T01:09:11Z

Реализовано:

Поддержка рекурсивных автоматов
Построение рекурсивного автомата по контекстно-свободной грамматике в расширенной форме Бэкуса-Наура (EBNF)
Построение EBNF по рекурсивному автомату
Алгоритм RPQ с возможностью пошаговой визуализации выполнения
Добавлены локализованные сообщения (messages*.properties)
Обновление конфигурации сборки (изменен репозиторий tornadofx)
Тестовое покрытие на реализованную функциональность

…or settings creation in RA factory class

…aton creation, update messages.properties

…F grammar subclass

…p code

…iews and execution logic for recursive automaton - Introduce RecursiveAutomatonBox vertex type and HasSubAutomaton interface for vertices containing sub-automaton - Update Automaton, AutomatonVertexView, AutomatonGraphView, and CentralView to support RecursiveAutomatonBox - Adjust transition and table views to hide labels for transitions connected to RecursiveAutomatonBox (unchangeable epsilon transitions) - Refactor execution logic to handle recursion and sub-automaton management - Extend EBNF grammar handling and export functionality - Update grammar input and error messages for consistency - Add tests for EBNF export

…age, update imports and references test(Recursive Automaton): add unit tests for RecursiveAutomaton and EBNF exporter

…class

…tructor into rsm

…lated classes

RSM, EBNF, RPQ

src/main/kotlin/automaton/constructor/controller/AutomatonGraphController.kt

IlyaMuravjov · 2025-10-01T20:53:09Z

src/main/kotlin/automaton/constructor/controller/AutomatonGraphController.kt

+                val srcV = source.vertex
+                val tgtV = automatonVertexView.vertex
+                if (srcV is RecursiveAutomatonBox && tgtV is RecursiveAutomatonBox) {
+                    information(
+                        "Transitions between recursive automaton boxes are not allowed",
+                        title = I18N.messages.getString("Dialog.information"),
+                        owner = automatonViewContext.uiComponent.currentWindow
+                    )
+                } else {
+                    automaton.addTransition(srcV, tgtV)
+                }


Этот if выглядит, как часть бизнес логики, которая по возможности должна обрабатываться моделью, а не контроллером. Кажется, конкретное условие логичнее перенести внутрь addTransition() и возвращать из этого метода успешность добавления перехода

Вынес безопасное создание перехода в helper (TransitionAddUIHelper.kt), который пытается добавить новый переход и выкидывает диалоговое окно в случае неудачи

Я имел ввиду, что к бизнес логике относится условие if и его логично перенести внутрь модели. Выносить тела веток if в пакет utils было не надо, utils --- это пакет для не домен-специфичных утилит, но это уже мелочи

src/main/kotlin/automaton/constructor/controller/AutomatonGraphController.kt

src/main/kotlin/automaton/constructor/model/automaton/AbstractAutomaton.kt

src/main/kotlin/automaton/constructor/view/elements/transition/AdjacencyMatrixTransitionView.kt

src/main/resources/messages.properties

src/test/kotlin/automaton/constructor/controller/algorithms/rpq/RPQAlgoTest.kt

IlyaMuravjov · 2025-10-01T21:56:36Z

src/main/kotlin/automaton/constructor/model/automaton/RecursiveAutomaton.kt

Нужно ещё обновить README и добавить видео в Wiki

Отправил приглашение, чтобы были права на редактирование Wiki

Про новые фичи, думаю, надо сделать пометку, что они появятся в релизе 1.3

Обновил README и Wiki. Не уверен, где лучше указать примечание про фичи -- перечислить в разделе Home или сделать пометки в разделах с соответствующей функциональностью

Я думаю, в разделах с соответствующей функциональностью. Хотя в целом можно и релиз выпустить, тогда не надо будет пометку делать

…hm.Error

…setFromString to remove unchecked cast

…asses to distinct package

…xt menu construction into function

…logic from AbstractAutomaton

…indow in case of error

…eAutomatonBox visible but not modifiable

IlyaMuravjov

С точки зрения архитектуры выглядит достаточно хорошо

Отдельное спасибо за за чистую структуру коммитов и следование conventional commits, особенно при исправлении замечаний

…Q algorithm (#34) * fix(ci): Update actions/cache from v2 to v3 * fix(ci): Update actions/cache from v2 to v3 * feat: Add RecursiveAutomaton type, data class and factory stub * feat: Add localized messages for RA, transition action for RA, stub for settings creation in RA factory class * feat: Add stub for CFG to RSA conversion * feat(view): add grammar input view (EBNFInputView) for RecursiveAutomaton creation, update messages.properties * feat(view): make separate class for EBNF grammar input view, make EBNF grammar subclass * feat(view): implement EBNF grammar input view * feat(view): implement production addition in EBNF grammar and clean up code * feat(Recursive Automaton): add RecursiveAutomatonBox vertex, update views and execution logic for recursive automaton - Introduce RecursiveAutomatonBox vertex type and HasSubAutomaton interface for vertices containing sub-automaton - Update Automaton, AutomatonVertexView, AutomatonGraphView, and CentralView to support RecursiveAutomatonBox - Adjust transition and table views to hide labels for transitions connected to RecursiveAutomatonBox (unchangeable epsilon transitions) - Refactor execution logic to handle recursion and sub-automaton management - Extend EBNF grammar handling and export functionality - Update grammar input and error messages for consistency - Add tests for EBNF export * refactor(grammar): move grammar-related classes to model.grammar package, update imports and references test(Recursive Automaton): add unit tests for RecursiveAutomaton and EBNF exporter * feat(RPQ Algorithm): add RPQ algorithm execution view and controller class * fix(build): change tornadofx repository * feat(RPQ Algorithm): implement RPQ algorithm and update execution view * refactor(grammar): refactor EBNF grammar to use RARegex and update related classes * refactor(i18n): rename Algorithms.Error to FiniteAutomatonOnlyAlgorithm.Error * fix(AutomatonElement): encapsulate string parsing in DynamicProperty.setFromString to remove unchecked cast * refactor(i18n): add correct localization via properties bundle * refactor(RecursiveAutomaton): move recursive automaton and related classes to distinct package * refactor(AutomatonGraphController): extract recursive automaton context menu construction into function * feat(test): add recursive automaton file for serialization test * refactor(Grammar): rename ProductionInterface to Production * refactor(RecursiveAutomaton): extract all RecursiveAutomaton related logic from AbstractAutomaton * refactor: implement helper for safe transition addition with dialog window in case of error * refactor(Transition): make labels on transitions from and to RecursiveAutomatonBox visible but not modifiable * fix(SteppingStrategy): restore correct `step` function logic * update README

AlexShmak and others added 18 commits May 26, 2025 04:44

fix(ci): Update actions/cache from v2 to v3

245dc58

fix(ci): Update actions/cache from v2 to v3

59b3bd5

Merge remote-tracking branch 'origin/develop' into develop

486cd71

feat: Add RecursiveAutomaton type, data class and factory stub

c90d43a

feat: Add localized messages for RA, transition action for RA, stub f…

280ea6d

…or settings creation in RA factory class

feat: Add stub for CFG to RSA conversion

6c95867

feat(view): add grammar input view (EBNFInputView) for RecursiveAutom…

a9d40cb

…aton creation, update messages.properties

feat(view): make separate class for EBNF grammar input view, make EBN…

da7e8d0

…F grammar subclass

feat(view): implement EBNF grammar input view

38795f2

feat(view): implement production addition in EBNF grammar and clean u…

dae46ed

…p code

refactor(grammar): move grammar-related classes to model.grammar pack…

c3e71a8

…age, update imports and references test(Recursive Automaton): add unit tests for RecursiveAutomaton and EBNF exporter

feat(RPQ Algorithm): add RPQ algorithm execution view and controller …

68c30b5

…class

fix(build): change tornadofx repository

6d0fc33

Merge branch 'rsm' of https://github.com/AlexShmak/KotlinAutomataCons…

2a2862d

…tructor into rsm

feat(RPQ Algorithm): implement RPQ algorithm and update execution view

017826f

refactor(grammar): refactor EBNF grammar to use RARegex and update re…

5f2f0cb

…lated classes

Merge pull request #1 from AlexShmak/rsm

f0d244c

RSM, EBNF, RPQ

gsvgit requested a review from IlyaMuravjov October 1, 2025 07:59

IlyaMuravjov reviewed Oct 1, 2025

View reviewed changes

AlexShmak added 10 commits October 3, 2025 19:44

refactor(i18n): rename Algorithms.Error to FiniteAutomatonOnlyAlgorit…

a15f524

…hm.Error

fix(AutomatonElement): encapsulate string parsing in DynamicProperty.…

0861f57

…setFromString to remove unchecked cast

refactor(i18n): add correct localization via properties bundle

f036267

refactor(RecursiveAutomaton): move recursive automaton and related cl…

93a48bc

…asses to distinct package

refactor(AutomatonGraphController): extract recursive automaton conte…

bdc7f80

…xt menu construction into function

feat(test): add recursive automaton file for serialization test

f25e01f

refactor(Grammar): rename ProductionInterface to Production

ae59c87

refactor(RecursiveAutomaton): extract all RecursiveAutomaton related …

f7eb58f

…logic from AbstractAutomaton

refactor: implement helper for safe transition addition with dialog w…

fa40033

…indow in case of error

refactor(Transition): make labels on transitions from and to Recursiv…

dd5e172

…eAutomatonBox visible but not modifiable

AlexShmak added 2 commits October 13, 2025 16:37

fix(SteppingStrategy): restore correct step function logic

7e977ed

update README

d18eba9

AlexShmak requested a review from IlyaMuravjov October 13, 2025 16:09

IlyaMuravjov approved these changes Oct 25, 2025

View reviewed changes

IlyaMuravjov merged commit 2149979 into spbu-se:develop Oct 27, 2025
2 checks passed

Comments

Conversation

AlexShmak commented Oct 1, 2025

Uh oh!

Uh oh!

Uh oh!

IlyaMuravjov Oct 1, 2025

Choose a reason for hiding this comment

Uh oh!

AlexShmak Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

IlyaMuravjov Oct 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

IlyaMuravjov Oct 1, 2025

Choose a reason for hiding this comment

Uh oh!

IlyaMuravjov Oct 1, 2025

Choose a reason for hiding this comment

Uh oh!

AlexShmak Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

IlyaMuravjov Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

IlyaMuravjov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

IlyaMuravjov Oct 25, 2025 •

edited

Loading