github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

getSuccessors: reuse a vector<State> for output

Browse Source
This commit is contained in:
Justin Viiret 2017-03-08 15:46:25 +11:00 committed by Matthew Barr
parent 7ad21500c4
commit cc1191d94c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
util/ng_find_matches.cpp
View File

@ -638,8 +638,9 @@ struct StateSet {
} }
// does not return SOM // does not return SOM
flat_set<State> getSuccessors(const State &state, const GraphCache &gc) const { void getSuccessors(const State &state, const GraphCache &gc,
flat_set<State> result; vector<State> &result) const {
result.clear();
// maximum shadow depth that we can go from current level // maximum shadow depth that we can go from current level
u32 max_depth = edit_distance - state.level + 1; u32 max_depth = edit_distance - state.level + 1;
@ -650,7 +651,7 @@ struct StateSet {
id != shadow_succ.npos; id != shadow_succ.npos;
id = shadow_succ.find_next(id)) { id = shadow_succ.find_next(id)) {
auto new_level = state.level + d; auto new_level = state.level + d;
result.emplace(id, new_level, 0, State::NODE_SHADOW); result.emplace_back(id, new_level, 0, State::NODE_SHADOW);
} }
const auto &helper_succ = gc.getHelperTransitions(state.idx, d); const auto &helper_succ = gc.getHelperTransitions(state.idx, d);
@ -658,11 +659,11 @@ struct StateSet {
id != helper_succ.npos; id != helper_succ.npos;
id = helper_succ.find_next(id)) { id = helper_succ.find_next(id)) {
auto new_level = state.level + d; auto new_level = state.level + d;
result.emplace(id, new_level, 0, State::NODE_HELPER); result.emplace_back(id, new_level, 0, State::NODE_HELPER);
} }
} }
return result; sort_and_unique(result);
} }
flat_set<State> getAcceptStates(const GraphCache &gc) const { flat_set<State> getAcceptStates(const GraphCache &gc) const {
@ -919,9 +920,11 @@ void step(const NGHolder &g, struct fmstate &state) {
const auto active = state.states.getActiveStates(); const auto active = state.states.getActiveStates();
vector<StateSet::State> succ_list;
for (const auto &cur : active) { for (const auto &cur : active) {
auto u = state.vertices[cur.idx]; auto u = state.vertices[cur.idx];
auto succ_list = state.states.getSuccessors(cur, state.gc); state.states.getSuccessors(cur, state.gc, succ_list);
for (auto succ : succ_list) { for (auto succ : succ_list) {
auto v = state.vertices[succ.idx]; auto v = state.vertices[succ.idx];