teaching/muMLE
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bug in matcher

Browse source
This commit is contained in:
Joeri Exelmans 2024-09-04 17:51:45 +02:00
parent a0ccb3f35d
commit f9049be167
1 changed files with 56 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

51
pattern_matching/matcher.py
View file

@ -105,12 +105,14 @@ class MatcherVF2:
def _match(self, state, already_visited, indent=0): def _match(self, state, already_visited, indent=0):
# print(" "*indent, "match") # print(" "*indent, "match")
def visit_for_first_time(state):
hashable_state = state.make_hashable() hashable_state = state.make_hashable()
if hashable_state in already_visited: if hashable_state in already_visited:
return False # print(" "*indent, " SKIP - ALREADY VISITED")
# print(" "*indent, " ", hashable_state)
return
# print(" "*indent, " ADD STATE")
# print(" "*indent, " ", hashable_state)
already_visited.add(hashable_state) already_visited.add(hashable_state)
return True
if len(state.mapping_edges) == len(self.guest.edges): if len(state.mapping_edges) == len(self.guest.edges):
@ -120,22 +122,32 @@ class MatcherVF2:
yield state yield state
return return
def read_edge(edge, direction):
if direction == "outgoing":
return edge.tgt
elif direction == "incoming":
return edge.src
else:
raise Exception("wtf!")
def attempt_grow(direction, indent): def attempt_grow(direction, indent):
# print(" "*indent, 'attempt_grow', direction) # print(" "*indent, 'attempt_grow', direction)
if state.boundary != None: if state.boundary != None:
g_vtx, h_vtx = state.boundary g_vtx, h_vtx = state.boundary
for g_candidate_edge in getattr(g_vtx, direction): for g_candidate_edge in getattr(g_vtx, direction):
# print(" "*indent, g_candidate_edge) # print(" "*indent, 'g_candidate_edge:', g_candidate_edge)
if g_candidate_edge in state.mapping_edges: if g_candidate_edge in state.mapping_edges:
# print(" "*indent, " skip, guest edge already matched")
continue # skip already matched guest edge continue # skip already matched guest edge
g_candidate_vtx = g_candidate_edge.tgt g_candidate_vtx = read_edge(g_candidate_edge, direction)
for h_candidate_edge in getattr(h_vtx, direction): for h_candidate_edge in getattr(h_vtx, direction):
# print(" "*indent, 'h_candidate_edge:', h_candidate_edge)
if h_candidate_edge in state.r_mapping_edges: if h_candidate_edge in state.r_mapping_edges:
# print(" "*indent, " skip, host edge already matched")
continue # skip already matched host edge continue # skip already matched host edge
h_candidate_vtx = h_candidate_edge.tgt h_candidate_vtx = read_edge(h_candidate_edge, direction)
new_state = state.grow_edge(h_candidate_edge, g_candidate_edge)
if visit_for_first_time(new_state):
# print(" "*indent, 'grow edge', g_candidate_edge, ':', h_candidate_edge) # print(" "*indent, 'grow edge', g_candidate_edge, ':', h_candidate_edge)
new_state = state.grow_edge(h_candidate_edge, g_candidate_edge)
yield from attempt_match_vtxs( yield from attempt_match_vtxs(
new_state, new_state,
g_candidate_vtx, g_candidate_vtx,
@ -143,13 +155,14 @@ class MatcherVF2:
indent+1) indent+1)
def attempt_match_vtxs(state, g_candidate_vtx, h_candidate_vtx, indent): def attempt_match_vtxs(state, g_candidate_vtx, h_candidate_vtx, indent):
new_state = state.grow_vtx(
h_candidate_vtx,
g_candidate_vtx)
if visit_for_first_time(new_state):
# print(" "*indent, 'attempt_match_vtxs') # print(" "*indent, 'attempt_match_vtxs')
if g_candidate_vtx in state.mapping_vtxs:
if state.mapping_vtxs[g_candidate_vtx] != h_candidate_vtx:
# print(" "*indent, " nope, guest already mapped (mismatch)")
return # guest vtx is already mapped but doesn't match host vtx
if h_candidate_vtx in state.r_mapping_vtxs: if h_candidate_vtx in state.r_mapping_vtxs:
if state.r_mapping_vtxs[h_candidate_vtx] != g_candidate_vtx: if state.r_mapping_vtxs[h_candidate_vtx] != g_candidate_vtx:
# print(" "*indent, " nope, host already mapped (mismatch)")
return # host vtx is already mapped but doesn't match guest vtx return # host vtx is already mapped but doesn't match guest vtx
g_outdegree = len(g_candidate_vtx.outgoing) g_outdegree = len(g_candidate_vtx.outgoing)
h_outdegree = len(h_candidate_vtx.outgoing) h_outdegree = len(h_candidate_vtx.outgoing)
@ -161,6 +174,9 @@ class MatcherVF2:
return return
if not self.compare_fn(h_candidate_vtx.value, g_candidate_vtx.value): if not self.compare_fn(h_candidate_vtx.value, g_candidate_vtx.value):
return return
new_state = state.grow_vtx(
h_candidate_vtx,
g_candidate_vtx)
# print(" "*indent, 'grow vtx', g_candidate_vtx, ':', h_candidate_vtx) # print(" "*indent, 'grow vtx', g_candidate_vtx, ':', h_candidate_vtx)
yield from self._match(new_state, already_visited, indent+1) yield from self._match(new_state, already_visited, indent+1)
@ -176,36 +192,39 @@ class MatcherVF2:
# if indent == 0: # if indent == 0:
# print('visited', len(already_visited), 'states total') # print('visited', len(already_visited), 'states total')
# demo time... # demo time...
if __name__ == "__main__": if __name__ == "__main__":
host = Graph() host = Graph()
host.vtxs = [Vertex(0), Vertex(1), Vertex(2)] host.vtxs = [Vertex(0), Vertex(1), Vertex(2), Vertex(3)]
host.edges = [ host.edges = [
Edge(host.vtxs[0], host.vtxs[1]), Edge(host.vtxs[0], host.vtxs[1]),
Edge(host.vtxs[1], host.vtxs[2]), Edge(host.vtxs[1], host.vtxs[2]),
Edge(host.vtxs[2], host.vtxs[0]), Edge(host.vtxs[2], host.vtxs[0]),
Edge(host.vtxs[2], host.vtxs[3]),
Edge(host.vtxs[3], host.vtxs[2]),
] ]
guest = Graph() guest = Graph()
guest.vtxs = [Vertex('src'), Vertex('tgt')] guest.vtxs = [Vertex('src'), Vertex('tgt')]
guest.edges = [ guest.edges = [
Edge(guest.vtxs[0], guest.vtxs[1]), Edge(guest.vtxs[0], guest.vtxs[1]),
Edge(guest.vtxs[1], guest.vtxs[0]),
] ]
m = MatcherVF2(host, guest, lambda hv, gv: True) m = MatcherVF2(host, guest, lambda hv, gv: True)
import time import time
durations = 0 durations = 0
iterations = 2000 iterations = 100
print("Patience...")
for n in range(iterations): for n in range(iterations):
time_start = time.perf_counter_ns() time_start = time.perf_counter_ns()
matches = [mm for mm in m.match()] matches = [mm for mm in m.match()]
# print("found", len(matches), "matches")
time_end = time.perf_counter_ns() time_end = time.perf_counter_ns()
time_duration = time_end - time_start time_duration = time_end - time_start
durations += time_duration durations += time_duration
print(f'{iterations} iterations, took {durations/1000000:.3f} ms, {durations/iterations/1000000:.3f} ms per iteration') print(f'{iterations} iterations, took {durations/1000000:.3f} ms, {durations/iterations/1000000:.3f} ms per iteration')
print("found", len(matches), "matches")
for mm in matches: for mm in matches:
print("match:") print("match:")
print(" ", mm.mapping_vtxs) print(" ", mm.mapping_vtxs)