Data: FormalRTE minor improvements

alib2data/src/rte/formal/FormalRTEElements.h

@@ -8,8 +8,8 @@
 #ifndef FORMAL_RTE_ELEMENTS_H_
 #define FORMAL_RTE_ELEMENTS_H_
-#include "FormalRTEAlternation.h"
 #include "FormalRTEElement.h"
+#include "FormalRTEAlternation.h"
 #include "FormalRTEEmpty.h"
 #include "FormalRTEIteration.h"
 #include "FormalRTESubstitution.h"

alib2data/src/rte/formal/FormalRTEIteration.h

@@ -258,7 +258,7 @@ int FormalRTEIteration < SymbolType, RankType >::compare ( const FormalRTEIterat
 template < class SymbolType, class RankType >
 void FormalRTEIteration < SymbolType, RankType >::operator >>( std::ostream & out ) const {
-	out << "(RTEFormalRTEIteration " << m_substitutionSymbol << " " << getElement ( ) << ")";
+	out << "(FormalRTEIteration " << m_substitutionSymbol << " " << getElement ( ) << ")";
 }
 template < class SymbolType, class RankType >

alib2data/src/rte/formal/FormalRTESubstitution.h

@@ -308,8 +308,8 @@ int FormalRTESubstitution < SymbolType, RankType >::compare ( const FormalRTESub
 template < class SymbolType, class RankType >
 void FormalRTESubstitution < SymbolType, RankType >::operator >>( std::ostream & out ) const {
 	out << "(FormalRTESubstitution";
-	out << " " << getLeftElement ( );
 	out << " " << m_substitutionSymbol;
+	out << " " << getLeftElement ( );
 	out << " " << getRightElement ( );
 	out << ")";
 }

examples2/automaton/DFTA_emptyset_case.xml

+<?xml version="1.0"?>
+<DFTA>
+	<states>
+		<String>A</String>
+		<String>B</String>
+	</states>
+	<rankedInputAlphabet>
+		<RankedSymbol>
+			<String>a</String>
+			<Unsigned>0</Unsigned>
+		</RankedSymbol>
+		<RankedSymbol>
+			<String>g</String>
+			<Unsigned>2</Unsigned>
+		</RankedSymbol>
+		<RankedSymbol>
+			<String>d</String>
+			<Unsigned>1</Unsigned>
+		</RankedSymbol>
+	</rankedInputAlphabet>
+	<finalStates>
+		<String>B</String>
+	</finalStates>
+	<transitions>
+		<transition>
+			<input>
+				<RankedSymbol><String>a</String><Unsigned>0</Unsigned></RankedSymbol>
+			</input>
+			<from>
+			</from>
+			<to>
+				<String>A</String>
+			</to>
+		</transition>
+		<transition>
+			<input>
+				<RankedSymbol><String>d</String><Unsigned>1</Unsigned></RankedSymbol>
+			</input>
+			<from>
+				<String>A</String>
+			</from>
+			<to>
+				<String>B</String>
+			</to>
+		</transition>
+		<transition>
+			<input>
+				<RankedSymbol><String>g</String><Unsigned>2</Unsigned></RankedSymbol>
+			</input>
+			<from>
+				<String>B</String>
+				<String>A</String>
+			</from>
+			<to>
+				<String>A</String>
+			</to>
+		</transition>
+	</transitions>
+</DFTA>