diff --git a/lib/adaptive_distinguishing_sequence.cpp b/lib/adaptive_distinguishing_sequence.cpp index 5a80b687d4a69109364df3144fe2a268263aea84..434f4822420a3f6283af59c07264d87b1205826f 100644 --- a/lib/adaptive_distinguishing_sequence.cpp +++ b/lib/adaptive_distinguishing_sequence.cpp @@ -39,7 +39,7 @@ adaptive_distinguishing_sequence create_adaptive_distinguishing_sequence(const r if(oboom.children.empty()) continue; - node.word = oboom.separator; + node.w = oboom.separator; for(auto && c : oboom.children){ adaptive_distinguishing_sequence new_c(0, node.depth + 1); diff --git a/lib/adaptive_distinguishing_sequence.hpp b/lib/adaptive_distinguishing_sequence.hpp index 8f0a9425a2ee836ab8ea4fd1b46fc39b5ac30b4b..a9755777b7648e4b4026a5e20ac197a9723c82ab 100644 --- a/lib/adaptive_distinguishing_sequence.hpp +++ b/lib/adaptive_distinguishing_sequence.hpp @@ -18,7 +18,7 @@ struct adaptive_distinguishing_sequence { // current, initial std::vector<std::pair<state, state>> CI; std::vector<adaptive_distinguishing_sequence> children; - word word; + word w; size_t depth; }; diff --git a/lib/separating_family.cpp b/lib/separating_family.cpp index 9ae22e7dbf40624b39bd1c92ed8896ccfff93c5b..0c1f845e00f9313be83283a58563aa9212463671 100644 --- a/lib/separating_family.cpp +++ b/lib/separating_family.cpp @@ -79,7 +79,7 @@ separating_family create_separating_family(const adaptive_distinguishing_sequenc } // add some work - for (auto && i : node.word) uio.push_back(i); // extend the word + for (auto && i : node.w) uio.push_back(i); // extend the word for (auto && c : node.children) work.push({uio, c}); // and visit the children with word } diff --git a/lib/write_tree_to_dot.cpp b/lib/write_tree_to_dot.cpp index f26baa75544633249935071037eebbddfedab4a4..28faa04c479d5aaf72e473d5b433dc4231fdaa4d 100644 --- a/lib/write_tree_to_dot.cpp +++ b/lib/write_tree_to_dot.cpp @@ -46,8 +46,8 @@ void write_adaptive_distinguishing_sequence_to_dot(const adaptive_distinguishing const auto symbols = create_reverse_map(t.input_indices); size_t overflows = 0; write_tree_to_dot(root, [&symbols, &overflows](const adaptive_distinguishing_sequence & node, ostream & out) { - if (!node.word.empty()) { - print_vec(out, node.word, " ", [&symbols](input x){ return "I" + symbols[x]; }); + if (!node.w.empty()) { + print_vec(out, node.w, " ", [&symbols](input x){ return "I" + symbols[x]; }); } else { vector<state> I(node.CI.size()); transform(begin(node.CI), end(node.CI), begin(I), [](pair<state, state> p){ return p.second; });