Changeset 1958

Timestamp:

06/01/15 13:55:48 (10 years ago)

Author:

pharms

Message:

• improved selection of sequence to be merged first

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRule.java (modified) (3 diffs)

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

@@ -1028 +1028 @@
                 int overallMinSumOfCollisionIndexes = Integer.MAX_VALUE;
                 int overallMinimalCollisionIndex = Integer.MAX_VALUE;
-                InterleavingSubsequence interleavingWithMinSum = null;
-                InterleavingSubsequence interleavingWithMinIndex = null;
+                List<InterleavingSubsequence> interleavingsWithMinSum = new LinkedList<>();
+                List<InterleavingSubsequence> interleavingsWithMinIndex = new LinkedList<>();
                 
                 for (InterleavingSubsequence interleaving : interleavings) {
@@ -1048 +1048 @@
                     
                     if (overallMinSumOfCollisionIndexes > sumOfCollisionIndexes) {
-                        interleavingWithMinSum = interleaving;
+                        interleavingsWithMinSum.clear();
+                        interleavingsWithMinSum.add(interleaving);
                         overallMinSumOfCollisionIndexes = sumOfCollisionIndexes;
                     }
                     else if (overallMinSumOfCollisionIndexes == sumOfCollisionIndexes) {
-                        // cannot decide between already found and new one
-                        interleavingWithMinSum = null;
+                        interleavingsWithMinSum.add(interleaving);
                     }
                     
                     if (overallMinimalCollisionIndex > minimalCollisionIndex) {
-                        interleavingWithMinIndex = interleaving;
+                        interleavingsWithMinIndex.clear();
+                        interleavingsWithMinIndex.add(interleaving);
                         overallMinimalCollisionIndex = minimalCollisionIndex;
                     }
                     else if (overallMinimalCollisionIndex == minimalCollisionIndex) {
-                        // cannot decide between already found and new one
-                        interleavingWithMinIndex = null;
-                    }
-                }
-                
-                if (interleavingWithMinSum != null) {
+                        interleavingsWithMinIndex.add(interleaving);
+                    }
+                }
+                
+                if (interleavingsWithMinSum.size() < appData.getLastFoundSubsequences().size()) {
                     for (InterleavingSubsequence interleaving : interleavings) {
-                        if (interleaving != interleavingWithMinSum) {
+                        boolean found = false;
+                        for (InterleavingSubsequence candidate : interleavingsWithMinSum) {
+                            if (candidate == interleaving) {
+                                found = true;
+                                break;
+                            }
+                        }
+                        
+                        if (!found) {
                             appData.getLastFoundSubsequences().remove(interleaving.getSubsequence());
                         }
@@ -1076 +1084 @@
                 }
                 
-                if (interleavingWithMinIndex != null) {
+                if (interleavingsWithMinIndex.size() < appData.getLastFoundSubsequences().size()) {
                     for (InterleavingSubsequence interleaving : interleavings) {
-                        if (interleaving != interleavingWithMinIndex) {
+                        boolean found = false;
+                        for (InterleavingSubsequence candidate : interleavingsWithMinIndex) {
+                            if (candidate == interleaving) {
+                                found = true;
+                                break;
+                            }
+                        }
+                        
+                        if (!found) {
                             appData.getLastFoundSubsequences().remove(interleaving.getSubsequence());
                         }