Changeset 1621 for branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms

Timestamp:

07/27/14 20:28:19 (10 years ago)

Author:

rkrimmel

Message:

Harmonizing matches

Location:

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

Files:

• Match.java (modified) (2 diffs)
• NumberSequence.java (modified) (4 diffs)

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.LinkedList;
 
 public class Match {
         private ArrayList<NumberSequence> matchseqs;
-        
-        private LinkedList<MatchOccurence> occurences; 
-        
-        
-        Match(){
+
+        private LinkedList<MatchOccurence> occurences;
+
+        Match() {
                 matchseqs = new ArrayList<NumberSequence>(2);
                 occurences = new LinkedList<MatchOccurence>();
@@ -16 +16 @@
                 matchseqs.add(null);
         }
-        
+
         public NumberSequence getFirstSequence() {
                 return matchseqs.get(0);
         }
-        
+
         public NumberSequence getSecondSequence() {
                 return matchseqs.get(1);
         }
-        
+
         public void setFirstSequence(NumberSequence seq) {
                 matchseqs.set(0, seq);
         }
-        
+
         public void setSecondSequence(NumberSequence seq) {
                 matchseqs.set(1, seq);
         }
-        
+
         public void addOccurence(MatchOccurence occurence) {
                 occurences.add(occurence);
         }
-        
+
         public int occurenceCount() {
                 return occurences.size();
-        }       
+        }
+
+        public boolean equals(Match m) {
+                if ((m.getFirstSequence().equals(this.getFirstSequence()) || m
+                                .getFirstSequence().equals(this.getSecondSequence()))
+                                && (m.getSecondSequence().equals(this.getFirstSequence()) || m
+                                                .getSecondSequence().equals(this.getSecondSequence()))) {
+                        return true;
+                }
+                return false;
+        }
+
+        public LinkedList<MatchOccurence> getOccurences() {
+                return occurences;
+        }
+
+        public void setOccurences(LinkedList<MatchOccurence> occurences) {
+                this.occurences = occurences;
+        }
+
+        
+        public void addOccurencesOf(Match m) {
+                LinkedList<MatchOccurence> occ = m.getOccurences();
+                occurences.addAll(occ);
+        }
 
 }

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.Random;
 
@@ -61 +62 @@
         }
 
-
-        public int containsPattern(Match pattern) {
+        //Searching occurences of 
+        public LinkedList<Integer> containsPattern(Match pattern) {
+                LinkedList<Integer> result = new LinkedList<Integer>();
                 int i = 0;
-                int count = 0;
                 int[] pat1 = pattern.getFirstSequence().getSequence();
                 int[] pat2 = pattern.getSecondSequence().getSequence();
@@ -88 +89 @@
                                         ipat2++;
                                 }
-                                count++;
+                                result.add(i);
                         }
                         i++;
                 }
-                return count;
+                return result;
         }
         
@@ -119 +120 @@
                 this.id = id;
         }
+        
+        public boolean equals(NumberSequence n) {
+                int[] seq = n.getSequence();
+                if(n.size() !=this.size()) {
+                        return false; 
+                }
+                for (int i=0; i<n.size();i++) {
+                        if(seq[i] != this.sequence[i]) {
+                                return false;
+                        }
+                }
+                return true;
+        }
+        
+        
 }