diff --git a/include/r8veritas.hh b/include/r8veritas.hh index a5ada62..8fb3177 100644 --- a/include/r8veritas.hh +++ b/include/r8veritas.hh @@ -95,7 +95,6 @@ private: }; std::unordered_set stat_pool; std::queue stats; - std::unordered_set remembered_stats; public: r8veritas::ins to_ins(const r8veritas::ins_bytecode &bc) { @@ -126,8 +125,9 @@ public: } // WARNING:ST WILL BE DESTROYED - r8veritas::stat_ref save_stat(r8veritas::stat &&st) { - return &(*stat_pool.insert(std::move(st)).first); + std::pair save_stat(r8veritas::stat &&st) { + auto t = stat_pool.insert(std::move(st)); + return {&(*(t.first)), !t.second}; } r8veritas::truthtable generate_truthtable(const r8veritas::op &operation) { @@ -137,12 +137,13 @@ public: inp[i] = i; out[i] = operation(r8veritas::cell(i)); } - return (r8veritas::truthtable(save_stat(std::move(inp)), - save_stat(std::move(out)))); + return (r8veritas::truthtable(save_stat(std::move(inp)).first, + save_stat(std::move(out)).first)); } - r8veritas::stat_ref operate_ins(const r8veritas::stat_ref &last_stat, - const r8veritas::ins &ins) { + std::pair // true means the next stat has been visited. + operate_ins(const r8veritas::stat_ref &last_stat, const r8veritas::ins &ins) { auto key = std::pair(last_stat, r8veritas::ins_bytecode(ins)); r8veritas::stat next_stat = *last_stat; int opcode = ins.bc & 1; @@ -159,9 +160,10 @@ public: } } } - r8veritas::stat_ref tmp_next_stat_ref = save_stat(std::move(next_stat)); - visited_op.insert(std::pair(tmp_next_stat_ref, std::move(key))); - return tmp_next_stat_ref; + auto tmp = save_stat(std::move(next_stat)); + + visited_op.insert(std::pair(tmp.first, std::move(key))); + return tmp; } void output_stat(const r8veritas::stat_ref &s) { @@ -262,7 +264,7 @@ public: } for (r8veritas::index i = 0; i < CELL_SIZE; i++) { if (influences[i] == 0) { - new_truthtable.first = operate_ins(new_truthtable.first, {0, i}); + new_truthtable.first = operate_ins(new_truthtable.first, {0, i}).first; } } return (new_truthtable); @@ -283,21 +285,18 @@ public: if (enable_debug_output) std::cout << "LAYER=" << layer << ",stats_size=" << i << std::endl; r8veritas::stat_ref tmp_stat_ref; - r8veritas::stat_ref tmp_ans; - auto operated = false; + std::pair ans; for (; i > 0; i--) { tmp_stat_ref = stats.front(); for (auto j : r8veritas::all_ins) { - tmp_ans = operate_ins(tmp_stat_ref, j); - if (tmp_ans == truthtable.second) { + ans = operate_ins(tmp_stat_ref, j); + if (ans.first == truthtable.second) { while (!stats.empty()) stats.pop(); - remembered_stats.clear(); return (true); } - if (!remembered_stats.contains(tmp_ans)) { - stats.push(tmp_ans); - remembered_stats.insert(tmp_ans); + if (!ans.second) { + stats.push(ans.first); } } stats.pop();