Changeset 1650 for branches

Timestamp:

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

Author:

rkrimmel

Message:

Fixed bug where containPattern didn't handle gaps correctly

Location:

branches

Files:

• autoquest-core-tasktrees-alignment-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequenceTest.java (modified) (3 diffs)
• autoquest-core-tasktrees-alignment-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignmentTest.java (moved) (moved from branches/autoquest-core-tasktrees-alignment-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleTest.java) (1 diff)
• autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequence.java (modified) (2 diffs)
• autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignment.java (modified) (1 diff)

branches/autoquest-core-tasktrees-alignment-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequenceTest.java

@@ -14 +14 @@
                 }
                 
-                int[] pat1 = new int[]{2,3,4};
-                int[] pat2 = new int[]{2,3,4};
+                int[] pat1  = new int[]{2,3,4};
+                int[] pat2  = new int[]{2,3,4};
                 
-                int[] pat3 = new int[]{5,-1,7};
-                int[] pat4 = new int[]{1,2,3};
+                int[] pat3  = new int[]{5,-1,6};
+                int[] pat4  = new int[]{1,2,3};
                 
-                int[] pat5 = new int[]{-1,-1,-1};
+                int[] pat5  = new int[]{-1,-1,-1};
                 
-                int[] pat6 = new int[]{10,11,12};
+                int[] pat6  = new int[]{10,11,12};
                 
-                int[] pat7 = new int[]{8,9,10};
-                int[] pat8 = new int[]{7,6,5};
+                int[] pat7  = new int[]{8,9,10};
+                int[] pat8  = new int[]{7,6,5};
                 
-                int[] pat9 = new int[]{0};
+                int[] pat9  = new int[]{0};
                 int[] pat10 = new int[]{1};
+                
+                int[] pat11 = new int[]{5,-1,-1,6};
+                int[] pat12 = new int[]{10,12,12,12}; 
                 
                 
@@ -49 +52 @@
                 
                 assertEquals(Integer.valueOf(1),ns.containsPattern(pattern).get(0));
+                assertEquals(2,ns.containsPattern(pattern).size());
                 assertEquals(Integer.valueOf(5),ns.containsPattern(pattern).get(1));
-                assertEquals(2,ns.containsPattern(pattern).size());
+                
         
                 firstpattern.setSequence(pat5);
@@ -69 +73 @@
                 assertEquals(Integer.valueOf(1),ns.containsPattern(pattern).get(1));
                 assertEquals(2,ns.containsPattern(pattern).size());
+                
+                firstpattern.setSequence(pat11);
+                secondpattern.setSequence(pat12);
+                assertEquals(1,ns.containsPattern(pattern).size());
+                assertEquals(Integer.valueOf(5),ns.containsPattern(pattern).get(0));
+                
         
         }

branches/autoquest-core-tasktrees-alignment-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignmentTest.java

@@ -20 +20 @@
  * @author Patrick Harms
  */
-public class SequenceForTaskDetectionRuleTest extends AbstractTemporalRelationshipTC {
+public class SequenceForTaskDetectionRuleAlignmentTest extends AbstractTemporalRelationshipTC {
 
     /**

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));