joshua/hybrid-ads
1
Fork 0
mirror of https://github.com/Jaxan/hybrid-ads.git synced 2025-04-27 23:17:44 +02:00
Code Issues Releases Activity

Fix for gcc (-fpermissive)

Browse source
This commit is contained in:
Joshua Moerman 2015-06-05 15:57:48 +02:00
parent 3063e30fec
commit 8d9286a0f8
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/adaptive_distinguishing_sequence.cpp
View file

@ -39,7 +39,7 @@ adaptive_distinguishing_sequence create_adaptive_distinguishing_sequence(const r
if(oboom.children.empty()) continue; if(oboom.children.empty()) continue;
node.word = oboom.separator; node.w = oboom.separator;
for(auto && c : oboom.children){ for(auto && c : oboom.children){
adaptive_distinguishing_sequence new_c(0, node.depth + 1); adaptive_distinguishing_sequence new_c(0, node.depth + 1);

2
lib/adaptive_distinguishing_sequence.hpp
View file

@ -18,7 +18,7 @@ struct adaptive_distinguishing_sequence {
// current, initial // current, initial
std::vector<std::pair<state, state>> CI; std::vector<std::pair<state, state>> CI;
std::vector<adaptive_distinguishing_sequence> children; std::vector<adaptive_distinguishing_sequence> children;
word word; word w;
size_t depth; size_t depth;
}; };

2
lib/separating_family.cpp
View file

@ -79,7 +79,7 @@ separating_family create_separating_family(const adaptive_distinguishing_sequenc
} }
// add some work // 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 for (auto && c : node.children) work.push({uio, c}); // and visit the children with word
} }

4
lib/write_tree_to_dot.cpp
View file

@ -46,8 +46,8 @@ void write_adaptive_distinguishing_sequence_to_dot(const adaptive_distinguishing
const auto symbols = create_reverse_map(t.input_indices); const auto symbols = create_reverse_map(t.input_indices);
size_t overflows = 0; size_t overflows = 0;
write_tree_to_dot(root, [&symbols, &overflows](const adaptive_distinguishing_sequence & node, ostream & out) { write_tree_to_dot(root, [&symbols, &overflows](const adaptive_distinguishing_sequence & node, ostream & out) {
if (!node.word.empty()) { if (!node.w.empty()) {
print_vec(out, node.word, " ", [&symbols](input x){ return "I" + symbols[x]; }); print_vec(out, node.w, " ", [&symbols](input x){ return "I" + symbols[x]; });
} else { } else {
vector<state> I(node.CI.size()); vector<state> I(node.CI.size());
transform(begin(node.CI), end(node.CI), begin(I), [](pair<state, state> p){ return p.second; }); transform(begin(node.CI), end(node.CI), begin(I), [](pair<state, state> p){ return p.second; });