diff --git a/alib2algo/src/automaton/simplify/Minimize.h b/alib2algo/src/automaton/simplify/Minimize.h index 41dde5759a5faf1cf4e6218f39a9b218dc1484ff..b81fd92c77e922b6b22fe5fabc86f4e94dcaff78 100644 --- a/alib2algo/src/automaton/simplify/Minimize.h +++ b/alib2algo/src/automaton/simplify/Minimize.h @@ -56,29 +56,29 @@ automaton::DFA < SymbolType, StateType > Minimize::minimize(const automaton::DFA refactor[transition.first.first].insert(std::make_pair(transition.first.second, transition.second)); } - std::map<StateType, StateType> toEquvivalentStates1; //original state to equivalent state + std::map<StateType, StateType> toEquivalentStates1; //original state to equivalent state std::map<std::pair<StateType, std::set<std::pair<SymbolType, StateType> > >, std::set<StateType> > minimizedTransitionFunction1; //mapped to the original state - std::map<StateType, StateType> toEquvivalentStates2; + std::map<StateType, StateType> toEquivalentStates2; std::map<std::pair<StateType, std::set<std::pair<SymbolType, StateType> > >, std::set<StateType> > minimizedTransitionFunction2; const StateType *firstFinal = NULL, *firstNonfinal = NULL; for(const StateType& state : dfa.getStates()) { if(dfa.getFinalStates().count(state) == 0) { // not a final state if(!firstNonfinal) firstNonfinal = &state; - toEquvivalentStates2.insert(std::pair<StateType, StateType>(state, *firstNonfinal)); + toEquivalentStates2.insert(std::pair<StateType, StateType>(state, *firstNonfinal)); } else { if(!firstFinal) firstFinal = &state; - toEquvivalentStates2.insert(std::pair<StateType, StateType>(state, *firstFinal)); + toEquivalentStates2.insert(std::pair<StateType, StateType>(state, *firstFinal)); } } for(const std::pair<const StateType, std::map<SymbolType, StateType> >& transition : refactor) { - const StateType& from = toEquvivalentStates2.find(transition.first)->second; + const StateType& from = toEquivalentStates2.find(transition.first)->second; std::set<std::pair<SymbolType, StateType> > transitionFunction; for(const std::pair<const SymbolType, StateType> & transitionFromState : transition.second) { - transitionFunction.insert(std::make_pair(transitionFromState.first, toEquvivalentStates2.find(transitionFromState.second)->second)); + transitionFunction.insert(std::make_pair(transitionFromState.first, toEquivalentStates2.find(transitionFromState.second)->second)); } minimizedTransitionFunction2[std::make_pair(from, transitionFunction)].insert(transition.first); @@ -90,24 +90,24 @@ automaton::DFA < SymbolType, StateType > Minimize::minimize(const automaton::DFA } do { - toEquvivalentStates1 = toEquvivalentStates2; + toEquivalentStates1 = toEquivalentStates2; minimizedTransitionFunction1 = minimizedTransitionFunction2; - toEquvivalentStates2.clear(); + toEquivalentStates2.clear(); minimizedTransitionFunction2.clear(); for(const std::pair<const std::pair<StateType, std::set<std::pair<SymbolType, StateType> > >, std::set<StateType> >& transition : minimizedTransitionFunction1) { for(const StateType& target : transition.second) { - toEquvivalentStates2.insert(std::make_pair(target, *(transition.second.begin()))); + toEquivalentStates2.insert(std::make_pair(target, *(transition.second.begin()))); } } for(const std::pair<const StateType, std::map<SymbolType, StateType> >& transition : refactor) { - const StateType& from = toEquvivalentStates2.find(transition.first)->second; + const StateType& from = toEquivalentStates2.find(transition.first)->second; std::set<std::pair<SymbolType, StateType> > transitionFunction; for(const std::pair<const SymbolType, StateType> & transitionFromState : transition.second) { - transitionFunction.insert(std::make_pair(transitionFromState.first, toEquvivalentStates2.find(transitionFromState.second)->second)); + transitionFunction.insert(std::make_pair(transitionFromState.first, toEquivalentStates2.find(transitionFromState.second)->second)); } minimizedTransitionFunction2[std::make_pair(from, transitionFunction)].insert(transition.first);