Changeset 13482 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching

Timestamp:

12/17/15 20:43:07 (9 years ago)

Author:

bburlacu

Message:

#1772: Merged trunk changes

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

• . (modified) (1 prop)
• 3.4/TreeMatching/QueryMatch.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/QueryMatch.cs

@@ -80 +80 @@
 
       bool equals = Comparer.Equals(a.Node, b.Node);
-
       if (equals && MatchParents) {
         var pa = a.Parent;
@@ -86 +85 @@
         if (pa == null && pb == null)
           return true;
-        if (pa != null && pb != null)
-          return pa.Level == pb.Level && Comparer.Equals(pa.Node, pb.Node);
-        return false;
+        if (pa == null || pb == null)
+          return false;
+        return pa.Level == pb.Level && Comparer.Equals(pa.Node, pb.Node);
       }
       return equals;