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

Timestamp:

08/24/14 21:12:44 (10 years ago)

Author:

rkrimmel

Message:

Creating more complex models...

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,boolean jumped1,boolean jumped2) {
+        private boolean matches(int i, 
+                                int[] p1, 
+                                int[] p2 ,
+                                int ip1,
+                                int ip2,
+                                boolean jumped1, //True if there was a gap in Sequence 1 of the pattern
+                                boolean jumped2, //True if there was a gap in Sequence 2 of the pattern
+                                boolean hadSelection, //True if the last match was a selection 
+                                boolean matchseq1,
+                                boolean matchseq2) {
                 
                 if(p1.length==ip1) {
@@ -56 +65 @@
                         return false;
                 }
-                if((p1[ip1]==sequence[i]||p2[ip2]==sequence[i]) && jumped1) {
-                        return matches(i+1,p1,p2,ip1+1,ip2+2,false,false);
+
+                boolean foundselection=(!(p1[ip1] == p2[ip2])&&!(p1[ip1]==-1||p2[ip2]==-1));
+                boolean matchInFirstPattern = (p1[ip1]==sequence[i]);
+                boolean matchInSecondPattern = (p2[ip2]==sequence[i]);
+                
+                if(foundselection && hadSelection) {
+                        if((matchInFirstPattern && matchseq1) || (matchInSecondPattern && matchseq2)){
+                                if(jumped1) {
+                                        return matches(i+1,p1,p2,ip1+1,ip2+2,false,false,foundselection,matchInFirstPattern,matchInSecondPattern);
+                                }
+                                if(jumped2) {
+                                        return matches(i+1,p1,p2,ip1+2,ip2+1,false,false,foundselection,matchInFirstPattern,matchInSecondPattern);
+                                }
+                                return matches(i+1,p1,p2,ip1+1,ip2+1,false,false,foundselection,matchInFirstPattern,matchInSecondPattern);
+                        }       
+                        else {
+                                return false;
+                        }
                 }
-                if((p1[ip1]==sequence[i]||p2[ip2]==sequence[i]) && jumped2) {
-                        return matches(i+1,p1,p2,ip1+2,ip2+1,false,false);
+
+                if((matchInFirstPattern||matchInSecondPattern) && jumped1) {
+                        return matches(i+1,p1,p2,ip1+1,ip2+2,false,false,foundselection,matchInFirstPattern,matchInSecondPattern);
                 }
-                if(p1[ip1]==sequence[i]||p2[ip2]==sequence[i]) {
-                        return matches(i+1,p1,p2,ip1+1,ip2+1,false,false);
+                if((matchInFirstPattern||matchInSecondPattern) && jumped2) {
+                        return matches(i+1,p1,p2,ip1+2,ip2+1,false,false,foundselection,matchInFirstPattern,matchInSecondPattern);
+                }
+                if(matchInFirstPattern||matchInSecondPattern) {
+                        return matches(i+1,p1,p2,ip1+1,ip2+1,false,false,foundselection,matchInFirstPattern,matchInSecondPattern);
                 }
                 if(p1[ip1]==-1) {
-                        return matches(i,p1,p2,ip1+1,ip2,true,false);
+                        return matches(i,p1,p2,ip1+1,ip2,true,false,false,false,false);
                 }
                 if(p2[ip2]==-1) {
-                        return matches(i,p1,p2,ip1,ip2+1,false,true);
+                        return matches(i,p1,p2,ip1,ip2+1,false,true,false,false,false);
                 }
         
@@ -83 +112 @@
 
                 while (i < sequence.length ) {
-                        if(matches(i,pat1,pat2,0,0,false,false)) {
+                        if(matches(i,pat1,pat2,0,0,false,false,false,false,false)) {
                                 result.add(i);
                         }