From dd6b63acb1386d89d75fe6b9ceb9399a356e92e9 Mon Sep 17 00:00:00 2001
From: IlyaShurupov <ilusha@workspace.com>
Date: Wed, 7 Feb 2024 16:38:44 +0300
Subject: [PATCH] reg automata fixes

---
 Language/public/Automata.hpp        | 12 +++++++++
 Language/public/RegularAutomata.hpp | 41 +++++++++++++----------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/Language/public/Automata.hpp b/Language/public/Automata.hpp
index 636126e..41aea3f 100644
--- a/Language/public/Automata.hpp
+++ b/Language/public/Automata.hpp
@@ -38,6 +38,9 @@ namespace tp {
 
 			[[nodiscard]] bool isEpsilon() const { return mType == EPSILON; }
 
+			const State* getState() const { return mState; }
+			const tAlphabetType& getSymbol() const { return mSymbol; }
+
 		private:
 			State* mState = nullptr;
 			Type mType;
@@ -53,6 +56,9 @@ namespace tp {
 		public:
 			void setValue(const tStateType& stateValue) { mStateVal = stateValue; }
 			void setAcceptance(bool isAccepting) { mIsAccepting = isAccepting; }
+			bool isAccepting() const { return mIsAccepting; }
+			const tStateType& getStateVal() const { return mStateVal; }
+			const Buffer<Transition>* getTransitions() const { return &mTransitions; }
 
 		private:
 			Buffer<Transition> mTransitions;
@@ -94,6 +100,11 @@ namespace tp {
 			return true;
 		}
 
+		[[nodiscard]] ualni numStates() const { return mStates.length(); }
+
+		[[nodiscard]] const List<State>* getStates() const { return &mStates; }
+
+	private:
 		typedef AvlTree<AvlNumericKey<State*>, bool> StatesSet;
 
 		// Expands initial set with states that are reachable from initial set with no input consumption (E-transitions)
@@ -128,6 +139,7 @@ namespace tp {
 			});
 		}
 
+	public:
 		template <typename tAlphabetIterator>
 		bool makeDeterministic(const tAlphabetIterator& allSymbols) {
 			if (!isValid()) return false;
diff --git a/Language/public/RegularAutomata.hpp b/Language/public/RegularAutomata.hpp
index 0146923..11c0ad0 100644
--- a/Language/public/RegularAutomata.hpp
+++ b/Language/public/RegularAutomata.hpp
@@ -27,51 +27,48 @@ namespace tp {
 		auto getTransitions() const { return &mTransitions; }
 		auto getStart() const { return mStart; }
 
-		void construct(const FiniteStateAutomation<tAlphabetType, tStateType>& dfa) {
+		void construct(const FiniteStateAutomation<tAlphabetType, tStateType>& automata) {
 			// mSymbolRange = { dfa.getRange().first(), dfa.getRange().last() };
 			ASSERT(0);
 
-			/*
 			auto range_len = ualni(mSymbolRange.mEnd - mSymbolRange.mBegin);
 			auto sizeX = range_len ? range_len : 1;
-			auto sizeY = (ualni) (dfa.nVertices() + 1);
+			auto sizeY = (ualni) (automata.numStates() + 1);
 
 			mTransitions.reserve({ sizeX, sizeY });
-			mTransitions.assign(dfa.nVertices());
+			mTransitions.assign(automata.numStates());
 			mStates.reserve(sizeY);
 
 			ualni idx = 0;
-			for (auto vertex : dfa.mVertices) {
-				auto state = vertex.data().termination ? vertex.data().state : tNoStateVal;
-				mStates[idx] = state;
+			for (auto state : *automata.getStates()) {
+				auto stateVal = state->isAccepting() ? state->getStateVal() : tNoStateVal;
+				mStates[idx] = stateVal;
 				idx++;
 			}
 
-			mStates[dfa.nVertices()] = tFailedStateVal;
+			mStates[automata.numStates()] = tFailedStateVal;
 
 			idx = 0;
-			for (auto vertex : dfa.mVertices) {
-				if (&vertex.data() == dfa.mStart) {
+			for (auto state : *automata.getStates()) {
+				if (&state.data() == automata.getStartState()) {
 					mStart = mIter = mIterPrev = idx;
 				}
 				idx++;
 			}
 
-			ualni vertexIdx = 0;
-			for (auto vertex : dfa.mVertices) {
-				for (auto edge : vertex.data().edges) {
-					ualni vertex2Idx = 0;
-					for (auto vertex2 : dfa.mVertices) {
-						if (edge.data().vertex == &vertex2.data()) break;
-						vertex2Idx++;
+			ualni stateIdx = 0;
+			for (auto state : *automata.getStates()) {
+				for (auto transition : *state->getTransitions()) {
+					ualni stateIdx2 = 0;
+					for (auto state2 : *automata.getStates()) {
+						if (transition->getState() == &state2.data()) break;
+						stateIdx2++;
 					}
-					auto const code = edge.data().transition_code;
-					mTransitions.set({ (ualni) (code - mSymbolRange.mBegin), (ualni) vertexIdx }, vertex2Idx);
+					auto const code = transition->getSymbol();
+					mTransitions.set({ (ualni) (code - mSymbolRange.mBegin), (ualni) stateIdx }, stateIdx2);
 				}
-				vertexIdx++;
+				stateIdx++;
 			}
-
-			 */
 		}
 
 		bool isTrapped() { return mStates[mIter] == tFailedStateVal; }