From 7bc88463b53ed0b4675182a722bbb775adff929d Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Mon, 16 Jul 2018 13:55:41 +0200
Subject: [PATCH] algo/elgo: Correct english name (obsolete english usefull ->
useful)
---
.../src/automaton/properties/UsefulStates.cpp | 25 ++++++++++++++++
.../{UsefullStates.h => UsefulStates.h} | 18 ++++++------
.../automaton/properties/UsefullStates.cpp | 25 ----------------
.../automaton/simplify/UselessStatesRemover.h | 8 ++---
.../properties/efficient/UsefulStates.cpp | 29 +++++++++++++++++++
.../{UsefullStates.h => UsefulStates.h} | 18 ++++++------
.../properties/efficient/UsefullStates.cpp | 29 -------------------
.../simplify/efficient/UselessStatesRemover.h | 8 ++---
8 files changed, 80 insertions(+), 80 deletions(-)
create mode 100644 alib2algo/src/automaton/properties/UsefulStates.cpp
rename alib2algo/src/automaton/properties/{UsefullStates.h => UsefulStates.h} (88%)
delete mode 100644 alib2algo/src/automaton/properties/UsefullStates.cpp
create mode 100644 alib2elgo/src/automaton/properties/efficient/UsefulStates.cpp
rename alib2elgo/src/automaton/properties/efficient/{UsefullStates.h => UsefulStates.h} (83%)
delete mode 100644 alib2elgo/src/automaton/properties/efficient/UsefullStates.cpp
diff --git a/alib2algo/src/automaton/properties/UsefulStates.cpp b/alib2algo/src/automaton/properties/UsefulStates.cpp
new file mode 100644
index 0000000000..f9dc1c02d7
--- /dev/null
+++ b/alib2algo/src/automaton/properties/UsefulStates.cpp
@@ -0,0 +1,25 @@
+/*
+ * UsefulStates.cpp
+ *
+ * Created on: 23. 3. 2014
+ * Author: Tomas Pecka
+ */
+
+#include "UsefulStates.h"
+#include <registration/AlgoRegistration.hpp>
+
+namespace automaton {
+
+namespace properties {
+
+auto UsefulStatesEpsilonNFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::EpsilonNFA < > & > ( UsefulStates::usefulStates );
+auto UsefulStatesNFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::NFA < > & > ( UsefulStates::usefulStates );
+auto UsefulStatesCompactNFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::CompactNFA < > & > ( UsefulStates::usefulStates );
+auto UsefulStatesExtendedNFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::ExtendedNFA < > & > ( UsefulStates::usefulStates );
+auto UsefulStatesMultiInitialStateNFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::MultiInitialStateNFA < > & > ( UsefulStates::usefulStates );
+auto UsefulStatesDFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::DFA < > & > ( UsefulStates::usefulStates );
+
+} /* namespace properties */
+
+} /* namespace automaton */
+
diff --git a/alib2algo/src/automaton/properties/UsefullStates.h b/alib2algo/src/automaton/properties/UsefulStates.h
similarity index 88%
rename from alib2algo/src/automaton/properties/UsefullStates.h
rename to alib2algo/src/automaton/properties/UsefulStates.h
index a975dd5044..a036d7a215 100644
--- a/alib2algo/src/automaton/properties/UsefullStates.h
+++ b/alib2algo/src/automaton/properties/UsefulStates.h
@@ -1,5 +1,5 @@
/*
- * UsefullStates.h
+ * UsefulStates.h
*
* This file is part of Algorithms library toolkit.
* Copyright (C) 2017 Jan Travnicek (jan.travnicek@fit.cvut.cz)
@@ -21,8 +21,8 @@
* Author: Tomas Pecka
*/
-#ifndef USEFULL_STATES_H_
-#define USEFULL_STATES_H_
+#ifndef USEFUL_STATES_H_
+#define USEFUL_STATES_H_
#include <alib/algorithm>
#include <alib/deque>
@@ -45,7 +45,7 @@ namespace properties {
* Find all useful states of an automaton.
* A state is useful if there exists any sequence of transitions that leads to the final state.
*/
-class UsefullStates {
+class UsefulStates {
public:
/**
* Finds all useful states of a finite automaton.
@@ -56,7 +56,7 @@ public:
* @return set of useful states of @p fsm
*/
template < class T >
- static ext::set < typename automaton::StateTypeOfAutomaton < T > > usefullStates( const T & fsm );
+ static ext::set < typename automaton::StateTypeOfAutomaton < T > > usefulStates( const T & fsm );
/**
* Finds all useful states of a deterministic finite automaton.
@@ -70,11 +70,11 @@ public:
* @return set of useful states of @p fsm
*/
template < class SymbolType, class StateType >
- static ext::set<StateType> usefullStates( const automaton::DFA < SymbolType, StateType > & fsm );
+ static ext::set<StateType> usefulStates( const automaton::DFA < SymbolType, StateType > & fsm );
};
template < class T >
-ext::set < typename automaton::StateTypeOfAutomaton < T > > UsefullStates::usefullStates( const T & fsm ) {
+ext::set < typename automaton::StateTypeOfAutomaton < T > > UsefulStates::usefulStates( const T & fsm ) {
using StateType = typename automaton::StateTypeOfAutomaton < T >;
// 1a
@@ -100,7 +100,7 @@ ext::set < typename automaton::StateTypeOfAutomaton < T > > UsefullStates::usefu
}
template < class SymbolType, class StateType >
-ext::set<StateType> UsefullStates::usefullStates( const automaton::DFA < SymbolType, StateType > & fsm ) {
+ext::set<StateType> UsefulStates::usefulStates( const automaton::DFA < SymbolType, StateType > & fsm ) {
// 1a
ext::deque<ext::set<StateType>> Qi;
Qi.push_back( ext::set<StateType>( ) );
@@ -127,4 +127,4 @@ ext::set<StateType> UsefullStates::usefullStates( const automaton::DFA < SymbolT
} /* namespace automaton */
-#endif /* USEFULL_STATES_H_ */
+#endif /* USEFUL_STATES_H_ */
diff --git a/alib2algo/src/automaton/properties/UsefullStates.cpp b/alib2algo/src/automaton/properties/UsefullStates.cpp
deleted file mode 100644
index e7215bd1ae..0000000000
--- a/alib2algo/src/automaton/properties/UsefullStates.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * UsefullStates.cpp
- *
- * Created on: 23. 3. 2014
- * Author: Tomas Pecka
- */
-
-#include "UsefullStates.h"
-#include <registration/AlgoRegistration.hpp>
-
-namespace automaton {
-
-namespace properties {
-
-auto UsefullStatesEpsilonNFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::EpsilonNFA < > & > ( UsefullStates::usefullStates );
-auto UsefullStatesNFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::NFA < > & > ( UsefullStates::usefullStates );
-auto UsefullStatesCompactNFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::CompactNFA < > & > ( UsefullStates::usefullStates );
-auto UsefullStatesExtendedNFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::ExtendedNFA < > & > ( UsefullStates::usefullStates );
-auto UsefullStatesMultiInitialStateNFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::MultiInitialStateNFA < > & > ( UsefullStates::usefullStates );
-auto UsefullStatesDFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::DFA < > & > ( UsefullStates::usefullStates );
-
-} /* namespace properties */
-
-} /* namespace automaton */
-
diff --git a/alib2algo/src/automaton/simplify/UselessStatesRemover.h b/alib2algo/src/automaton/simplify/UselessStatesRemover.h
index 96d2130263..d4b386b400 100644
--- a/alib2algo/src/automaton/simplify/UselessStatesRemover.h
+++ b/alib2algo/src/automaton/simplify/UselessStatesRemover.h
@@ -24,7 +24,7 @@
#ifndef USELESS_STATES_REMOVER_H_
#define USELESS_STATES_REMOVER_H_
-#include <automaton/properties/UsefullStates.h>
+#include <automaton/properties/UsefulStates.h>
#include <automaton/FSM/ExtendedNFA.h>
#include <automaton/FSM/CompactNFA.h>
@@ -94,7 +94,7 @@ T UselessStatesRemover::remove( const T & fsm ) {
using StateType = typename automaton::StateTypeOfAutomaton < T >;
// 1.
- ext::set<StateType> Qu = automaton::properties::UsefullStates::usefullStates( fsm );
+ ext::set<StateType> Qu = automaton::properties::UsefulStates::usefulStates( fsm );
// 2.
T M(fsm.getInitialState());
@@ -123,7 +123,7 @@ T UselessStatesRemover::remove( const T & fsm ) {
template < class SymbolType, class StateType >
automaton::DFA < SymbolType, StateType > UselessStatesRemover::remove( const automaton::DFA < SymbolType, StateType > & fsm ) {
// 1.
- ext::set<StateType> Qu = automaton::properties::UsefullStates::usefullStates( fsm );
+ ext::set<StateType> Qu = automaton::properties::UsefulStates::usefulStates( fsm );
// 2.
automaton::DFA < SymbolType, StateType > M ( fsm.getInitialState () );
@@ -151,7 +151,7 @@ automaton::DFA < SymbolType, StateType > UselessStatesRemover::remove( const aut
template < class SymbolType, class StateType >
automaton::MultiInitialStateNFA < SymbolType, StateType > UselessStatesRemover::remove( const automaton::MultiInitialStateNFA < SymbolType, StateType > & fsm ) {
// 1.
- ext::set<StateType> Qu = automaton::properties::UsefullStates::usefullStates( fsm );
+ ext::set<StateType> Qu = automaton::properties::UsefulStates::usefulStates( fsm );
// 2.
automaton::MultiInitialStateNFA < SymbolType, StateType > M;
diff --git a/alib2elgo/src/automaton/properties/efficient/UsefulStates.cpp b/alib2elgo/src/automaton/properties/efficient/UsefulStates.cpp
new file mode 100644
index 0000000000..7be90decd9
--- /dev/null
+++ b/alib2elgo/src/automaton/properties/efficient/UsefulStates.cpp
@@ -0,0 +1,29 @@
+/*
+ * UsefulStates.cpp
+ *
+ * Created on: 23. 3. 2014
+ * Author: Tomas Pecka
+ */
+
+#include "UsefulStates.h"
+#include <registration/AlgoRegistration.hpp>
+
+namespace automaton {
+
+namespace properties {
+
+namespace efficient {
+
+auto UsefulStatesEpsilonNFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::EpsilonNFA < > & > ( UsefulStates::usefulStates );
+auto UsefulStatesNFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::NFA < > & > ( UsefulStates::usefulStates );
+auto UsefulStatesCompactNFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::CompactNFA < > & > ( UsefulStates::usefulStates );
+auto UsefulStatesExtendedNFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::ExtendedNFA < > & > ( UsefulStates::usefulStates );
+auto UsefulStatesMultiInitialStateNFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::MultiInitialStateNFA < > & > ( UsefulStates::usefulStates );
+auto UsefulStatesDFA = registration::AbstractRegister < UsefulStates, ext::set < DefaultStateType >, const automaton::DFA < > & > ( UsefulStates::usefulStates );
+
+} /* namespace efficient */
+
+} /* namespace properties */
+
+} /* namespace automaton */
+
diff --git a/alib2elgo/src/automaton/properties/efficient/UsefullStates.h b/alib2elgo/src/automaton/properties/efficient/UsefulStates.h
similarity index 83%
rename from alib2elgo/src/automaton/properties/efficient/UsefullStates.h
rename to alib2elgo/src/automaton/properties/efficient/UsefulStates.h
index 66dce4db94..f262e217e1 100644
--- a/alib2elgo/src/automaton/properties/efficient/UsefullStates.h
+++ b/alib2elgo/src/automaton/properties/efficient/UsefulStates.h
@@ -1,12 +1,12 @@
/*
- * UsefullStates.h
+ * UsefulStates.h
*
* Created on: 23. 3. 2014
* Author: Tomas Pecka
*/
-#ifndef EFFICIENT_USEFULL_STATES_H_
-#define EFFICIENT_USEFULL_STATES_H_
+#ifndef EFFICIENT_USEFUL_STATES_H_
+#define EFFICIENT_USEFUL_STATES_H_
#include <algorithm>
#include <deque>
@@ -26,19 +26,19 @@ namespace properties {
namespace efficient {
-class UsefullStates {
+class UsefulStates {
public:
/**
* Removes dead states from FSM. Melichar 2.32
*/
template < class T >
- static ext::set < typename automaton::StateTypeOfAutomaton < T > > usefullStates( const T & fsm );
+ static ext::set < typename automaton::StateTypeOfAutomaton < T > > usefulStates( const T & fsm );
template < class SymbolType, class StateType >
- static ext::set<StateType> usefullStates( const automaton::DFA < SymbolType, StateType > & fsm );
+ static ext::set<StateType> usefulStates( const automaton::DFA < SymbolType, StateType > & fsm );
};
template < class T >
-ext::set < typename automaton::StateTypeOfAutomaton < T > > UsefullStates::usefullStates( const T & fsm ) {
+ext::set < typename automaton::StateTypeOfAutomaton < T > > UsefulStates::usefulStates( const T & fsm ) {
using StateType = typename automaton::StateTypeOfAutomaton < T >;
ext::map<StateType, ext::set<StateType>> reversedTransitions;
@@ -63,7 +63,7 @@ ext::set < typename automaton::StateTypeOfAutomaton < T > > UsefullStates::usefu
}
template < class SymbolType, class StateType >
-ext::set<StateType> UsefullStates::usefullStates( const automaton::DFA < SymbolType, StateType > & fsm ) {
+ext::set<StateType> UsefulStates::usefulStates( const automaton::DFA < SymbolType, StateType > & fsm ) {
ext::map<StateType, ext::set<StateType>> reversedTransitions;
for(const auto& transition : fsm.getTransitions())
reversedTransitions[transition.second].insert(transition.first.first);
@@ -90,4 +90,4 @@ ext::set<StateType> UsefullStates::usefullStates( const automaton::DFA < SymbolT
} /* namespace automaton */
-#endif /* EFFICIENT_USEFULL_STATES_H_ */
+#endif /* EFFICIENT_USEFUL_STATES_H_ */
diff --git a/alib2elgo/src/automaton/properties/efficient/UsefullStates.cpp b/alib2elgo/src/automaton/properties/efficient/UsefullStates.cpp
deleted file mode 100644
index dcfd2fc596..0000000000
--- a/alib2elgo/src/automaton/properties/efficient/UsefullStates.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * UsefullStates.cpp
- *
- * Created on: 23. 3. 2014
- * Author: Tomas Pecka
- */
-
-#include "UsefullStates.h"
-#include <registration/AlgoRegistration.hpp>
-
-namespace automaton {
-
-namespace properties {
-
-namespace efficient {
-
-auto UsefullStatesEpsilonNFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::EpsilonNFA < > & > ( UsefullStates::usefullStates );
-auto UsefullStatesNFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::NFA < > & > ( UsefullStates::usefullStates );
-auto UsefullStatesCompactNFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::CompactNFA < > & > ( UsefullStates::usefullStates );
-auto UsefullStatesExtendedNFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::ExtendedNFA < > & > ( UsefullStates::usefullStates );
-auto UsefullStatesMultiInitialStateNFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::MultiInitialStateNFA < > & > ( UsefullStates::usefullStates );
-auto UsefullStatesDFA = registration::AbstractRegister < UsefullStates, ext::set < DefaultStateType >, const automaton::DFA < > & > ( UsefullStates::usefullStates );
-
-} /* namespace efficient */
-
-} /* namespace properties */
-
-} /* namespace automaton */
-
diff --git a/alib2elgo/src/automaton/simplify/efficient/UselessStatesRemover.h b/alib2elgo/src/automaton/simplify/efficient/UselessStatesRemover.h
index cb32c30859..ef96549104 100644
--- a/alib2elgo/src/automaton/simplify/efficient/UselessStatesRemover.h
+++ b/alib2elgo/src/automaton/simplify/efficient/UselessStatesRemover.h
@@ -19,7 +19,7 @@
#include <automaton/FSM/NFA.h>
#include <automaton/FSM/DFA.h>
-#include "../../properties/efficient/UsefullStates.h"
+#include "../../properties/efficient/UsefulStates.h"
namespace automaton {
@@ -45,7 +45,7 @@ T UselessStatesRemover::remove( const T & fsm ) {
using StateType = typename automaton::StateTypeOfAutomaton < T >;
// 1.
- ext::set<StateType> Qu = automaton::properties::efficient::UsefullStates::usefullStates( fsm );
+ ext::set<StateType> Qu = automaton::properties::efficient::UsefulStates::usefulStates( fsm );
// 2.
T M(fsm.getInitialState());
@@ -74,7 +74,7 @@ T UselessStatesRemover::remove( const T & fsm ) {
template < class SymbolType, class StateType >
automaton::DFA < SymbolType, StateType > UselessStatesRemover::remove( const automaton::DFA < SymbolType, StateType > & fsm ) {
// 1.
- ext::set<StateType> Qu = automaton::properties::efficient::UsefullStates::usefullStates( fsm );
+ ext::set<StateType> Qu = automaton::properties::efficient::UsefulStates::usefulStates( fsm );
// 2.
automaton::DFA < SymbolType, StateType > M ( fsm.getInitialState () );
@@ -102,7 +102,7 @@ automaton::DFA < SymbolType, StateType > UselessStatesRemover::remove( const aut
template < class SymbolType, class StateType >
automaton::MultiInitialStateNFA < SymbolType, StateType > UselessStatesRemover::remove( const automaton::MultiInitialStateNFA < SymbolType, StateType > & fsm ) {
// 1.
- ext::set<StateType> Qu = automaton::properties::efficient::UsefullStates::usefullStates( fsm );
+ ext::set<StateType> Qu = automaton::properties::efficient::UsefulStates::usefulStates( fsm );
// 2.
automaton::MultiInitialStateNFA < SymbolType, StateType > M;
--
GitLab