Rename matcher modules to make more sense

transformation/matcher.py

@@ -6,7 +6,7 @@ from uuid import UUID
 from services.bottom.V0 import Bottom
 from services.scd import SCD
 from services import od as services_od
-from transformation.matcher.matcher import Graph, Edge, Vertex, MatcherVF2
+from transformation.vf2 import Graph, Edge, Vertex, MatcherVF2
 from transformation import ramify
 import itertools
 import re
@@ -14,8 +14,6 @@ import functools
 
 from util.timer import Timer
 
-from services.primitives.integer_type import Integer
-
 class _is_edge:
     def __repr__(self):
         return "EDGE"

transformation/rule.py

@@ -5,7 +5,7 @@ import functools
 
 from api.od import ODAPI
 from concrete_syntax.common import indent
-from transformation.matcher.mvs_adapter import match_od
+from transformation.matcher import match_od
 from transformation.rewriter import rewrite
 from transformation.cloner import clone_od
 

transformation/vf2.py

@@ -1,4 +1,5 @@
 # This module contains a VF2-inspired graph matching algorithm
+# It defines its own Graph type, and can be used standalone (no dependencies on the rest of muMLE framework)
 # Author: Joeri Exelmans
 
 import itertools