Changeset 1650 for branches/autoquest-core-tasktrees-alignment/src

Timestamp:

08/04/14 17:27:03 (10 years ago)

Author:

rkrimmel

Message:

Fixed bug where containPattern didn't handle gaps correctly

Location:

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees

Files:

• alignment/algorithms/NumberSequence.java (modified) (2 diffs)
• temporalrelation/SequenceForTaskDetectionRuleAlignment.java (modified) (1 diff)

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequence.java

@@ -48 +48 @@
         }
 
-        //Searching occurences of 
+        //Searching occurrences of 
         public LinkedList<Integer> containsPattern(Match pattern) {
                 LinkedList<Integer> result = new LinkedList<Integer>();
@@ -58 +58 @@
                                 int ipat1 =0;
                                 int ipat2 =0;
+                                int optcount1 = 0;
+                                int optcount2 = 0;
                                 while(ipat1 < pat1.length && ipat2<pat2.length) {
                                         if(pat1[ipat1]==-1) {
                                                 ipat1++;
+                                                optcount1++;
                                                 continue;
                                         }
                                         if(pat2[ipat2]==-1) {
                                                 ipat2++;
+                                                optcount2++;
                                                 continue;
                                         }
-                                        if (sequence[i + ipat1] != pat1[ipat1]
-                                                        && sequence[i + ipat2] != pat2[ipat2]) {
+                                        if (sequence[i + ipat1-optcount1] != pat1[ipat1]
+                                                        && sequence[i + ipat2-optcount2] != pat2[ipat2]) {
                                                 i++;
+                                                //System.out.println(sequence[i+ipat1] + " != " + pat1[ipat1] + " || " + sequence[i+ipat2] + " != " + pat2[ipat2]);
                                                 continue notmatched;
                                         }

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignment.java

@@ -206 +206 @@
                                                         .hasNext();) {
                                                 int start = jt.next();
-                                                System.out.println("Found match ");
-                                                pattern.getFirstSequence().printSequence();
-                                                pattern.getSecondSequence().printSequence(); 
-                                                System.out.println("in sequence " + (j+1) + " at position " + start);
+                                                //System.out.println("Found match ");
+                                                //pattern.getFirstSequence().printSequence();
+                                                //pattern.getSecondSequence().printSequence(); 
+                                                //System.out.println("in sequence " + (j+1) + " at position " + start);
                                                 pattern.addOccurence(
                                                                 new MatchOccurence(start, j));