diff --git a/include/r8veritas.hh b/include/r8veritas.hh index 5246acd..1b77b1f 100644 --- a/include/r8veritas.hh +++ b/include/r8veritas.hh @@ -111,19 +111,19 @@ std::pair operate_ins(const r8veritas::stat_ref &last_stat, const r8veritas::ins &ins); // true means that {stat,ins} has been operated. -static std::unordered_map< +inline std::unordered_map< std::pair, r8veritas::stat_ref> visited_stat; -static std::unordered_map< +inline std::unordered_map< r8veritas::stat_ref, std::pair> visited_op; -static std::unordered_set stat_pool; -static std::array default_nicknames; -static std::array tp_paths; +inline std::unordered_set stat_pool; +inline std::array nicknames; +inline std::array tp_paths; std::ostream &operator<<(std::ostream &os, const r8veritas::stat &s); @@ -136,7 +136,6 @@ bool bfs(const r8veritas::truthtable &truthtable, r8veritas::index layer = 1); r8veritas::path track_path(const r8veritas::truthtable &truthtable); std::ostream &operator<<(std::ostream &os, const r8veritas::stat_ref &s); std::ostream &operator<<(std::ostream &os, const r8veritas::ins &s); -std::array initialize_nicknames(); -std::array -initialize_tp_paths(std::array nickname_list); +void initialize_nicknames(); +void initialize_tp_paths(); #endif \ No newline at end of file diff --git a/src/r8veritas.cc b/src/r8veritas.cc index b4be030..a57a9e1 100644 --- a/src/r8veritas.cc +++ b/src/r8veritas.cc @@ -3,28 +3,24 @@ #include #include #include -#include #include #include #include #include #include -std::array initialize_nicknames() { - std::array arr; +void initialize_nicknames() { for (r8veritas::index i = 0; i < CELL_SIZE; i++) { - arr[i] = std::to_string(i + 1); + nicknames[i] = "%" + std::to_string(i + 1); } - return (arr); + return; } -std::array -initialize_tp_paths(std::array nickname_list) { - std::array arr; +void initialize_tp_paths() { for (r8veritas::index i = 0; i < CELL_SIZE; i++) { - arr[i] = ".tp %" + nickname_list[i]; + tp_paths[i] = ".tp " + nicknames[i]; } - return (arr); + return; } r8veritas::stat_ref generate_empty_stat() { @@ -156,7 +152,7 @@ bool bfs(const r8veritas::truthtable &truthtable, r8veritas::index layer) { } r8veritas::index i = stats.size(); - std::cout << "LAYER=" << layer << ",stats_size=" << i << std::endl; + // std::cout << "LAYER=" << layer << ",stats_size=" << i << std::endl; r8veritas::stat_ref tmp_stat_ref; std::pair tmp_ans; auto operated = false; diff --git a/tests/r8_test.cc b/tests/r8_test.cc index 359a569..d4c7c8b 100644 --- a/tests/r8_test.cc +++ b/tests/r8_test.cc @@ -30,9 +30,10 @@ r8veritas::cell func_full_add_S(r8veritas::cell inp) { } int main() { - default_nicknames = initialize_nicknames(); - tp_paths = initialize_tp_paths(default_nicknames); - auto tab1 = generate_truthtable(func_and); + initialize_nicknames(); + initialize_tp_paths(); + + auto tab1 = generate_truthtable(func_full_add_Co); auto new_tab1 = compress_stat_space(tab1); if (bfs(new_tab1)) { r8veritas::path p = track_path(tab1); @@ -41,7 +42,9 @@ int main() { p.pop(); } } - /* + + nicknames[4] = "bit_add_buf_1"; + initialize_tp_paths(); auto tab2 = generate_truthtable(func_full_add_S); auto new_tab2 = compress_stat_space(tab2); if (bfs(new_tab2)) { @@ -50,6 +53,6 @@ int main() { std::cout << r8veritas::to_ins(p.top().second) << std::endl; p.pop(); } - }*/ + } return (0); }