Changeset 1620 for branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequence.java

Timestamp:

07/23/14 18:18:11 (10 years ago)

Author:

rkrimmel

Message:

More intelligent match finding and creation

File:

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

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

@@ -6 +6 @@
 public class NumberSequence {
         private int[] sequence;
-        private int signature;
+        private int id;
+
+        public ArrayList<Match> getMatches() {
+                return matches;
+        }
+
+
+        public void setMatches(ArrayList<Match> matches) {
+                this.matches = matches;
+        }
+        
+        public void addMatches(ArrayList<Match> matches) {
+                this.matches.addAll(matches);
+        }
+
+        private ArrayList<Match> matches;
 
         public NumberSequence(int size) {
@@ -12 +27 @@
                 sequence = new int[size];
         }
-
+        
         public int[] getSequence() {
                 return sequence;
@@ -21 +36 @@
         }
 
-        public int getSignature() {
-                return signature;
-        }
-
-        public void setSignature(int signature) {
-                this.signature = signature;
-        }
+        
 
         public void printSequence() {
@@ -38 +47 @@
         public NumberSequence shuffle() {
                 NumberSequence result = new NumberSequence(sequence.length);
+                result.setId(getId());
                 result.setSequence(this.sequence);
                 Random rgen = new Random();
@@ -51 +61 @@
         }
 
-        // TODO: This can be done faster
-        public int containsPattern(ArrayList<NumberSequence> pattern) {
+
+        public int containsPattern(Match pattern) {
                 int i = 0;
                 int count = 0;
-                int[] pat1 = pattern.get(0).getSequence();
-                int[] pat2 = pattern.get(1).getSequence();
+                int[] pat1 = pattern.getFirstSequence().getSequence();
+                int[] pat2 = pattern.getSecondSequence().getSequence();
                 notmatched: while (i < sequence.length - pat1.length) {
                         if (sequence[i] == pat1[0] || sequence[i] == pat2[0]) {
-                                for (int j = 0; j < pat1.length; j++) {
-                                        if (sequence[i + j] != pat1[j]
-                                                        && sequence[i + j] != pat2[j]) {
+                                int ipat1 =0;
+                                int ipat2 =0;
+                                while(ipat1 < pat1.length && ipat2<pat2.length) {
+                                        if(pat1[ipat1]==-1) {
+                                                ipat1++;
+                                                continue;
+                                        }
+                                        if(pat2[ipat2]==-1) {
+                                                ipat2++;
+                                                continue;
+                                        }
+                                        if (sequence[i + ipat1] != pat1[ipat1]
+                                                        && sequence[i + ipat2] != pat2[ipat2]) {
                                                 i++;
                                                 continue notmatched;
                                         }
+                                        ipat1++;
+                                        ipat2++;
                                 }
                                 count++;
@@ -72 +94 @@
                 return count;
         }
+        
+        //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) {
+                                count++;
+                        }
+                }
+                return count;
+        }
 
         public int size() {
                 return sequence.length;
         }
+
+
+        public int getId() {
+                return id;
+        }
+
+
+        public void setId(int id) {
+                this.id = id;
+        }
 }