fix vector memory leak

This commit is contained in:
2019-09-13 12:03:45 -04:00
parent 09e27c3bd9
commit 0787e2c103

View File

@@ -52,34 +52,35 @@ struct Table {
} }
std::vector<std::vector<int>> words() { std::vector<std::vector<int>> words() {
std::vector<std::vector<int> *> vecs(size()); std::vector<std::vector<int>> vecs(size());
vecs[0] = new std::vector<int>(); std::vector<bool> done_vecs(size());
done_vecs[0] = true;
bool done = false;
while (!done) {
done = true;
while (std::find(vecs.begin(), vecs.end(), nullptr) != vecs.end()) {
for (int from = 0; from < (int) vecs.size(); ++from) { for (int from = 0; from < (int) vecs.size(); ++from) {
std::vector<int> *word = vecs[from]; if (done_vecs[from]) {
if (word == nullptr) { done = false;
continue; continue;
} }
std::vector<int> word = vecs[from];
for (int gen = 0; gen < (int) N; ++gen) { for (int gen = 0; gen < (int) N; ++gen) {
int to = get(from, gen); int to = get(from, gen);
if (vecs[to] != nullptr) { if (done_vecs[to]) {
continue; continue;
} }
vecs[to] = new std::vector<int>(*word); done_vecs[to] = true;
vecs[to]->push_back(gen); vecs[to].assign(word.size() + 1, gen);
std::copy(word.begin(), word.end(), vecs[to].begin());
} }
} }
} }
std::vector<std::vector<int>> res(size()); return vecs;
for (int i = 0; i < (int) size(); ++i) {
res[i] = *vecs[i];
}
return res;
} }
}; };