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

Timestamp:

08/11/14 08:22:13 (10 years ago)

Author:

rkrimmel

Message:

About to fix bug in containsPattern

File:

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

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

@@ -8 +8 @@
         private int id;
 
-
         public NumberSequence(int size) {
 
                 sequence = new int[size];
         }
-        
+
         public int[] getSequence() {
                 return sequence;
@@ -45 +44 @@
         }
 
-        //Searching occurrences of 
+        // Searching occurrences of
         public LinkedList<Integer> containsPattern(Match pattern) {
                 LinkedList<Integer> result = new LinkedList<Integer>();
@@ -51 +50 @@
                 int[] pat1 = pattern.getFirstSequence().getSequence();
                 int[] pat2 = pattern.getSecondSequence().getSequence();
-                notmatched: while (i < sequence.length - pat1.length) {
+                notmatched: while (i <= sequence.length - pat1.length) {
                         if (sequence[i] == pat1[0] || sequence[i] == pat2[0]) {
-                                int ipat1 =0;
-                                int ipat2 =0;
+                                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-optcount1] != pat1[ipat1]
-                                                        && sequence[i + ipat2-optcount2] != pat2[ipat2]) {
+                                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 - optcount1] != pat1[ipat1]
+                                                        && sequence[i + ipat2 - optcount2] != pat2[ipat2]) {
                                                 i++;
-                                                //System.out.println(sequence[i+ipat1] + " != " + pat1[ipat1] + " || " + sequence[i+ipat2] + " != " + pat2[ipat2]);
+                                                // System.out.println(sequence[i+ipat1-optcount1] +
+                                                // " != " + pat1[ipat1] + " || " +
+                                                // sequence[i+ipat2-optcount2] + " != " + pat2[ipat2]);
                                                 continue notmatched;
                                         }
-                                        ipat1++;
-                                        ipat2++;
+                                                ipat1++;
+                                                ipat2++;
                                 }
+                                
                                 result.add(i);
+                                System.out.println("FOUND MATCH AT: " + i);
+                                this.printSequence();
+                                pattern.getFirstSequence().printSequence();
+                                pattern.getSecondSequence().printSequence();
                         }
                         i++;
@@ -83 +94 @@
                 return result;
         }
-        
-        //Returns the number of times event occurs in this sequence
+
+        // Returns the number of times event occurs in this sequence
         public int eventCount(int event) {
                 int count = 0;
-                for(int i=0;i<sequence.length;i++) {
-                        if(sequence[i] == event) {
+                for (int i = 0; i < sequence.length; i++) {
+                        if (sequence[i] == event) {
                                 count++;
                         }
@@ -99 +110 @@
         }
 
-
         public int getId() {
                 return id;
         }
 
-
         public void setId(int id) {
                 this.id = id;
         }
-        
+
         public boolean equals(NumberSequence n) {
                 int[] seq = n.getSequence();
-                if(n.size() !=this.size()) {
-                        return false; 
+                if (n.size() != this.size()) {
+                        return false;
                 }
-                for (int i=0; i<n.size();i++) {
-                        if(seq[i] != this.sequence[i]) {
+                for (int i = 0; i < n.size(); i++) {
+                        if (seq[i] != this.sequence[i]) {
                                 return false;
                         }
@@ -121 +130 @@
                 return true;
         }
-        
-        
+
 }