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

Fixes memory usage (part two). Introduces time complexity issue...

Browse source
This commit is contained in:
Joshua Moerman 2015-05-21 10:12:03 +02:00
parent 713b5fb48c
commit 1497315778
4 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/characterization_family.cpp
View file

@ -11,13 +11,12 @@
using namespace std;
characterization_family create_seperating_family(const adaptive_distinguishing_sequence & sequence,
const separating_matrix & sep_matrix) {
const splitting_tree & separating_sequences) {
const auto N = sequence.CI.size();
vector<trie> suffixes(N);
characterization_family ret(N);
// First we accumulate the kind-of-UIOs and the separating words we need. We will do this with a
// breath first search. If we encouter a set of states which is not a singleton, we add
// sequences from the matrix, locally and globally.
@ -36,18 +35,24 @@ characterization_family create_seperating_family(const adaptive_distinguishing_s
suffixes[state].insert(word);
}
trie all_global_separating_words;
// for each distinct pair, look up the lca in the splitting tree and add that word.
// This gives a very bad complexity! (cubic I guess)
// I believe this can be fixed to quadratic
for (auto && p : node.CI) {
for (auto && q : node.CI) {
const auto s = p.second;
const auto t = q.second;
if (s == t) continue;
if (s <= t) continue;
const auto & sep_word = sep_matrix[s][t];
vector<bool> states(N, false);
states[s] = states[t] = true;
const auto root = lca(separating_sequences,
[&states](auto z) -> bool { return states[z]; });
const auto & sep_word = root.seperator;
suffixes[s].insert(sep_word);
all_global_separating_words.insert(sep_word);
suffixes[t].insert(sep_word);
}
}
@ -56,14 +61,8 @@ characterization_family create_seperating_family(const adaptive_distinguishing_s
const auto s = p.second;
auto & current_suffixes = suffixes[s];
// local suffixes are done by now
// they are the same (FIXME)
ret[s].local_suffixes = flatten(current_suffixes);
// add the global ones
all_global_separating_words.for_each(
[&current_suffixes](auto w) { current_suffixes.insert(w); });
// and fix them
ret[s].global_suffixes = flatten(current_suffixes);
current_suffixes.clear();
}

2
lib/characterization_family.hpp
View file

@ -26,4 +26,4 @@ using characterization_family = std::vector<characterization_set>;
/// \brief Creates the characterization family from the results of the LY algorithm
/// If the sequence is complete, we do not need the separating_matrix
characterization_family create_seperating_family(const adaptive_distinguishing_sequence & sequence,
const separating_matrix & sep_matrix);
const splitting_tree & separating_sequences);

6
src/main.cpp
View file

@ -64,12 +64,8 @@ int main(int argc, char *argv[]) try {
return create_splitting_tree(machine, randomize_hopcroft ? randomized_hopcroft_style : hopcroft_style);
}();
const auto all_pair_seperating_sequences_ = [&]{
time_logger t("gathering all seperating sequences");
return create_all_pair_seperating_sequences(splitting_tree_hopcroft.root);
}();
return all_pair_seperating_sequences_;
return splitting_tree_hopcroft.root;
}();
auto sequence = [&]{

2
src/methods.cpp
View file

@ -44,7 +44,7 @@ int main(int argc, char * argv[]) {
auto pairs_fut = async([&] {
const auto tree = create_splitting_tree(machine, randomized_min_hopcroft_style);
return create_all_pair_seperating_sequences(tree.root);
return tree.root;
});
auto prefixes_fut = async([&] {