diff --git a/include/r8veritas.hh b/include/r8veritas.hh index 1653b55..7206503 100644 --- a/include/r8veritas.hh +++ b/include/r8veritas.hh @@ -16,7 +16,7 @@ #define INS_SIZE (CELL_SIZE + 1) // mask and bytecode -#define INS_BYTECODE_SIZE (CELL_SIZE + 1 + CELL_SIZE_BITWIDTH) +#define INS_BYTECODE_SIZE (INS_SIZE + CELL_SIZE_BITWIDTH) // mask,bytecode and sacrifice namespace r8veritas { diff --git a/src/r8veritas.cc b/src/r8veritas.cc index 0ba73fe..138dc7d 100644 --- a/src/r8veritas.cc +++ b/src/r8veritas.cc @@ -1,7 +1,9 @@ #include "r8veritas.hh" +#include #include #include #include +#include #include #include @@ -37,8 +39,8 @@ std::pair operate_ins(const r8veritas::stat &last_stat, } } } - visited_stat.insert_or_assign(key, next_stat); - visited_op.insert_or_assign(next_stat, std::move(key)); + visited_stat.insert(std::pair(key, next_stat)); + visited_op.insert(std::pair(next_stat, std::move(key))); return {next_stat, false}; } @@ -49,6 +51,26 @@ std::ostream &operator<<(std::ostream &os, const r8veritas::stat &s) { return (os); } +std::ostream &operator<<(std::ostream &os, const r8veritas::ins &s) { + + auto str = std::bitset(s.bc).to_string(); + std::reverse(str.begin(), str.end()); + os << s.bc << ":{"; + if ((s.bc != 0b0) && (s.bc != 0b1)) { + os << "OPERATION:"; + if (str[0] == '0') + os << "SET1: "; + else + os << "FLIP: "; + for (r8veritas::index i = 1; i < str.length(); i++) { + if (str[i] == '1') + os << i << " "; + } + } + os << ",SACRIFICE:" << s.sacrifice << "}"; + return (os); +} + r8veritas::truthtable compress_stat_space(const r8veritas::truthtable &raw_truthtable) { std::array influences; @@ -107,7 +129,7 @@ r8veritas::path track_path(const r8veritas::truthtable &truthtable) { for (auto tmp_stat = truthtable.second; tmp_stat != truthtable.first;) { p.push(visited_op[tmp_stat]); tmp_stat = p.top().first; - std::cout << tmp_stat << ";" << p.top().second << std::endl; + std::cout << r8veritas::ins(p.top().second) << std::endl; } return p; } \ No newline at end of file