fixed bug with NAC matching

mt/ptcal/pytcore/tcore/matcher.py

@@ -171,7 +171,7 @@ class Matcher(RulePrimitive):
                         for nac_mapping in nacMatcher.match_iter(context=bridgeMapping):
                             # Make the mapping into {...,NAClabel:graphIndex,...}
                             match = Match()
-                            match.from_mapping(nac_mapping, graph, self.condition)
+                            match.from_mapping(nac_mapping, graph, NAC)
                             if NAC[HC.MT_CONSTRAINT](match.to_label_mapping(graph), graph):
                                 # An occurrence of the NAC is found: current mapping is not valid
                                 invalid = True

mt/ptcal/pytcore/tcore/messages.py

@@ -283,9 +283,9 @@ class Match(dict):
         '''
         for pattern_node in mapping:
             #print "Pattern Graph: ", pattern_graph
-            #print "Pattern Graph.vs: ", pattern_graph.vs
+            #print "len(Pattern Graph.vs): ", pattern_graph.vcount()
             #print "Pattern Node: ", pattern_node
-            if pattern_node < len(pattern_graph.vs):
+            if pattern_node < pattern_graph.vcount():
                 #print "Pattern Graph.vs[pattern_node]: ", pattern_graph.vs[pattern_node]
                 label = pattern_graph.vs[pattern_node][Himesis.Constants.MT_LABEL]
                 guid = source_graph.vs[mapping[pattern_node]][Himesis.Constants.GUID]