From e8dd9d08612636a2c505e4f89d2a75a063dc50fd Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Sat, 6 Sep 2014 14:59:09 +0200
Subject: [PATCH] simplify equation creating
---
.../conversions/fa2re/BrzozowskiAlgebraic.cpp | 33 +++----------------
1 file changed, 5 insertions(+), 28 deletions(-)
diff --git a/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.cpp b/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.cpp
index 1b7db735b5..266d2ab8cd 100644
--- a/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.cpp
+++ b/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.cpp
@@ -30,23 +30,13 @@ regexp::UnboundedRegExp BrzozowskiAlgebraic::convert( const automaton::NFA & aut
{
if( isInSet( q, automaton.getFinalStates( ) ) )
solver.addEquation( alphabet::Symbol( alphabet::LabeledSymbol ( q.getName( ) ) ), new regexp::UnboundedRegExpEpsilon( ) );
- else
- solver.addEquation( alphabet::Symbol( alphabet::LabeledSymbol ( q.getName( ) ) ), new regexp::UnboundedRegExpEmpty( ) );
}
- for( const auto & p : automaton.getStates( ) )
+ for( const auto & p : automaton.getTransitions() )
{
- for( const auto & q : automaton.getStates( ) )
+ for( const auto & q : p.second )
{
- regexp::UnboundedRegExpAlternation* alt = new regexp::UnboundedRegExpAlternation( );
- alt->appendElement( regexp::UnboundedRegExpEmpty { } );
-
- for( const auto & symbol : automaton.getInputAlphabet( ) ) {
- auto toStates = automaton.getTransitionsFromState(p)[std::make_pair(p, symbol)];
- if ( isInSet( q , toStates ) )
- alt->appendElement( regexp::UnboundedRegExpSymbol { symbol } );
- }
- solver.addEquation( alphabet::Symbol( alphabet::LabeledSymbol ( p.getName( ) ) ), alphabet::Symbol( alphabet::LabeledSymbol( q.getName( ) ) ), alt );
+ solver.addEquation( alphabet::Symbol( alphabet::LabeledSymbol ( p.first.first.getName() ) ), alphabet::Symbol( alphabet::LabeledSymbol( q.getName() ) ), new regexp::UnboundedRegExpSymbol { p.first.second } );
}
}
@@ -74,24 +64,11 @@ regexp::UnboundedRegExp BrzozowskiAlgebraic::convert( const automaton::DFA & aut
{
if( isInSet( q, automaton.getFinalStates( ) ) )
solver.addEquation( alphabet::Symbol( alphabet::LabeledSymbol ( q.getName( ) ) ), new regexp::UnboundedRegExpEpsilon( ) );
- else
- solver.addEquation( alphabet::Symbol( alphabet::LabeledSymbol ( q.getName( ) ) ), new regexp::UnboundedRegExpEmpty( ) );
}
- for( const auto & p : automaton.getStates( ) )
+ for( const auto & p : automaton.getTransitions() )
{
- for( const auto & q : automaton.getStates( ) )
- {
- regexp::UnboundedRegExpAlternation* alt = new regexp::UnboundedRegExpAlternation( );
- alt->appendElement( regexp::UnboundedRegExpEmpty { } );
-
- for( const auto & symbol : automaton.getInputAlphabet( ) ) {
- auto toState = automaton.getTransitionsFromState(p);
- if( isKeyInMap(std::make_pair(p, symbol), toState) && toState.find(std::make_pair(p, symbol))->second == q )
- alt->appendElement( regexp::UnboundedRegExpSymbol { symbol } );
- }
- solver.addEquation( alphabet::Symbol( alphabet::LabeledSymbol ( p.getName( ) ) ), alphabet::Symbol( alphabet::LabeledSymbol( q.getName( ) ) ), alt );
- }
+ solver.addEquation( alphabet::Symbol( alphabet::LabeledSymbol ( p.first.first.getName() ) ), alphabet::Symbol( alphabet::LabeledSymbol( p.second.getName() ) ), new regexp::UnboundedRegExpSymbol { p.first.second } );
}
return regexp::UnboundedRegExp { solver.solve( alphabet::Symbol( alphabet::LabeledSymbol (automaton.getInitialState().getName() ) ) ).getRegExp() };
--
GitLab