Changeset 1848 for trunk

Timestamp:

12/23/14 11:19:04 (10 years ago)

Author:

pharms

Message:

• rename of task instance comparator to task comparator as it actually compares tasks
• smaller performance improvements

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/utils/TaskTraversalMyersDiff.java (modified) (4 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/utils/TaskTraversalMyersDiff.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.tasktrees.temporalrelation.utils;
 
-import de.ugoe.cs.autoquest.tasktrees.temporalrelation.TaskInstanceComparator;
+import de.ugoe.cs.autoquest.tasktrees.temporalrelation.TaskComparator;
 import difflib.ChangeDelta;
 import difflib.Chunk;
@@ -33 +33 @@
     
     /**  */
-    private final TaskInstanceComparator comparator;
+    private final TaskComparator comparator;
 
     /**
      *
      */
-    public TaskTraversalMyersDiff(TaskInstanceComparator comparator) {
+    public TaskTraversalMyersDiff(TaskComparator comparator) {
         this.comparator = comparator;
     }
@@ -102 +102 @@
                 // but the algorithm is one-based
                 // that's why there's no +1 when indexing the sequences
-                synchronized (comparator) {
-                    while ((i < N) && (j < M) && comparator.equals(variant1.get(i), variant2.get(j)))
-                    {
-                        i++;
-                        j++;
-                    }
+                while ((i < N) && (j < M) && comparator.equals(variant1.get(i), variant2.get(j))) {
+                    i++;
+                    j++;
                 }
                 
@@ -169 +166 @@
             
             Chunk original = new Chunk(ianchor, variant1.subList(ianchor, i));
+            int originalSize = original.size();
             Chunk revised = new Chunk(janchor, variant2.subList(janchor, j));
+            int revisedSize = revised.size();
             Delta delta = null;
             
-            if ((original.size() == 0) && (revised.size() != 0)) {
+            if ((originalSize == 0) && (revisedSize != 0)) {
                 delta = new InsertDelta(original, revised);
             }
-            else if ((original.size() > 0) && (revised.size() == 0)) {
+            else if ((originalSize > 0) && (revisedSize == 0)) {
                 delta = new DeleteDelta(original, revised);
             }