diff --git a/lib/mealy.hpp b/lib/mealy.hpp index b72d439..f5637d3 100644 --- a/lib/mealy.hpp +++ b/lib/mealy.hpp @@ -29,7 +29,7 @@ struct mealy { size_t output_size = 0; }; -inline auto is_complete(const mealy & m){ +inline bool is_complete(const mealy & m){ for(state n = 0; n < m.graph_size; ++n){ if(m.graph[n].size() != m.input_size) return false; for(auto && e : m.graph[n]) if(e.to == state(-1) || e.output == output(-1)) return false; @@ -37,12 +37,12 @@ inline auto is_complete(const mealy & m){ return true; } -inline auto apply(mealy const & m, state state, input input){ +inline mealy::edge apply(mealy const & m, state state, input input){ return m.graph[state][input]; } template -auto apply(mealy const & m, state state, Iterator b, Iterator e){ +mealy::edge apply(mealy const & m, state state, Iterator b, Iterator e){ mealy::edge ret; ret.to = state; while(b != e){ diff --git a/lib/partition.hpp b/lib/partition.hpp index 4c691e8..7876b66 100644 --- a/lib/partition.hpp +++ b/lib/partition.hpp @@ -8,7 +8,7 @@ #include template -auto partition_(Iterator b, Iterator e, Fun && function, size_t output_size) { +std::list> partition_(Iterator b, Iterator e, Fun && function, size_t output_size) { using namespace std; using T = typename decay::type; diff --git a/src/metrics.cpp b/src/metrics.cpp index 13d60d2..22d111f 100644 --- a/src/metrics.cpp +++ b/src/metrics.cpp @@ -7,7 +7,7 @@ using namespace std; -static auto create_transfer_sequences(const mealy& machine, const state s, const input ignore){ +static vector create_transfer_sequences(const mealy& machine, const state s, const input ignore){ vector visited(machine.graph_size, false); queue work;