Changeset 1665 for branches/autoquest-core-tasktrees-alignment

Timestamp:

08/12/14 21:45:18 (10 years ago)

Author:

rkrimmel

Message:

Found last bug in containsPattern

File:

• branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequence.java (modified) (3 diffs)

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

@@ -45 +45 @@
 
         //Recursive check if sequence contains pattern at position i
-        private boolean matches(int i, int[] p1, int[] p2 ,int ip1,int ip2) {
+        private boolean matches(int i, int[] p1, int[] p2 ,int ip1,int ip2,boolean jumped1,boolean jumped2) {
                 
                 if(p1.length==ip1) {
@@ -56 +56 @@
                         return false;
                 }
+                if((p1[ip1]==sequence[i]||p2[ip2]==sequence[i]) && jumped1) {
+                        return matches(i+1,p1,p2,ip1+1,ip2+2,false,false);
+                }
+                if((p1[ip1]==sequence[i]||p2[ip2]==sequence[i]) && jumped2) {
+                        return matches(i+1,p1,p2,ip1+2,ip2+1,false,false);
+                }
                 if(p1[ip1]==sequence[i]||p2[ip2]==sequence[i]) {
-                        return matches(i+1,p1,p2,ip1+1,ip2+1);
+                        return matches(i+1,p1,p2,ip1+1,ip2+1,false,false);
                 }
                 if(p1[ip1]==-1) {
-                        return matches(i,p1,p2,ip1+1,ip2);
+                        return matches(i,p1,p2,ip1+1,ip2,true,false);
                 }
                 if(p2[ip2]==-1) {
-                        return matches(i,p1,p2,ip1,ip2+1);
+                        return matches(i,p1,p2,ip1,ip2+1,false,true);
                 }
+        
                 return false;
         }
@@ -76 +83 @@
 
                 while (i < sequence.length ) {
-                        if(matches(i,pat1,pat2,0,0)) {
+                        if(matches(i,pat1,pat2,0,0,false,false)) {
                                 result.add(i);
                         }