Changeset 102 for trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models

Timestamp:

07/04/11 15:57:06 (13 years ago)

Author:

sherbold

Message:

• replaced java.util.Set and Java.util.List with java.util.Collection where possible

Location:

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models

Files:

• DeterministicFiniteAutomaton.java (modified) (2 diffs)
• FirstOrderMarkovModel.java (modified) (3 diffs)
• HighOrderMarkovModel.java (modified) (2 diffs)
• IStochasticProcess.java (modified) (5 diffs)
• PredictionByPartialMatch.java (modified) (2 diffs)
• Trie.java (modified) (2 diffs)
• TrieBasedModel.java (modified) (6 diffs)
• TrieNode.java (modified) (3 diffs)

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/DeterministicFiniteAutomaton.java

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.models;
 
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -61 +62 @@
                 }
 
-                List<Event<?>> followers = trie.getFollowingSymbols(contextCopy);
+                Collection<Event<?>> followers = trie.getFollowingSymbols(contextCopy);
 
                 if (followers.size() != 0 && followers.contains(symbol)) {

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/FirstOrderMarkovModel.java

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Random;
@@ -167 +168 @@
                         List<Event<?>> context = new ArrayList<Event<?>>();
                         context.add(symbol);
-                        List<Event<?>> followers = trie.getFollowingSymbols(context);
+                        Collection<Event<?>> followers = trie.getFollowingSymbols(context);
                         for (Event<?> follower : followers) {
                                 stringBuilder.append(" " + symbol.hashCode() + " -> "
@@ -199 +200 @@
                         context.add(symbol);
 
-                        List<Event<?>> followers = trie.getFollowingSymbols(context);
+                        Collection<Event<?>> followers = trie.getFollowingSymbols(context);
 
                         for (Event<?> follower : followers) {

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/HighOrderMarkovModel.java

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.models;
 
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -49 +50 @@
 
         
-                List<Event<?>> followers = trie.getFollowingSymbols(contextCopy);
+                Collection<Event<?>> followers = trie.getFollowingSymbols(contextCopy);
                 int sumCountFollowers = 0; // N(s\sigma')
                 for( Event<?> follower : followers ) {

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/IStochasticProcess.java

@@ -2 +2 @@
 
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 import de.ugoe.cs.eventbench.data.Event;
@@ -55 +55 @@
          * @see #generateSequences(int, boolean)
          */
-        public Set<List<? extends Event<?>>> generateSequences(int length);
+        public Collection<List<? extends Event<?>>> generateSequences(int length);
 
         /**
@@ -73 +73 @@
          * @return generated sequences
          */
-        public Set<List<? extends Event<?>>> generateSequences(int length,
+        public Collection<List<? extends Event<?>>> generateSequences(int length,
                         boolean fromStart);
 
@@ -88 +88 @@
          * @return generated sequences
          */
-        public Set<List<? extends Event<?>>> generateValidSequences(int length);
+        public Collection<List<? extends Event<?>>> generateValidSequences(int length);
 
         /**
@@ -117 +117 @@
          * @return events known by the process
          */
-        public Set<? extends Event<?>> getEvents();
+        public Collection<? extends Event<?>> getEvents();
 
 }

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/PredictionByPartialMatch.java

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.models;
 
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -116 +117 @@
                 }
 
-                List<Event<?>> followers = trie.getFollowingSymbols(contextCopy); // \Sigma'
+                Collection<Event<?>> followers = trie.getFollowingSymbols(contextCopy); // \Sigma'
                 int sumCountFollowers = 0; // N(s\sigma')
                 for (Event<?> follower : followers) {

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/Trie.java

@@ -2 +2 @@
 
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -103 +104 @@
         
         // returns all symbols that follow the defined sequence
-        public List<T> getFollowingSymbols(List<T> sequence) {
-                List<T> result = new LinkedList<T>();
+        public Collection<T> getFollowingSymbols(List<T> sequence) {
+                Collection<T> result = new LinkedList<T>();
                 TrieNode<T> node = find(sequence);
                 if( node!=null ) {

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/TrieBasedModel.java

@@ -3 +3 @@
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -84 +85 @@
          *            training data
          */
-        public void train(List<List<Event<?>>> sequences) {
+        public void train(Collection<List<Event<?>>> sequences) {
                 trie = new Trie<Event<?>>();
 
@@ -204 +205 @@
          */
         @Override
-        public Set<? extends Event<?>> getEvents() {
+        public Collection<? extends Event<?>> getEvents() {
                 return trie.getKnownSymbols();
         }
@@ -215 +216 @@
          */
         @Override
-        public Set<List<? extends Event<?>>> generateSequences(int length) {
+        public Collection<List<? extends Event<?>>> generateSequences(int length) {
                 return generateSequences(length, false);
         }
@@ -249 +250 @@
                         return sequenceSet;
                 }
-                Set<? extends Event<?>> events = getEvents();
-                Set<List<? extends Event<?>>> seqsShorter = generateSequences(
+                Collection<? extends Event<?>> events = getEvents();
+                Collection<List<? extends Event<?>>> seqsShorter = generateSequences(
                                 length - 1, fromStart);
                 for (Event<?> event : events) {
@@ -273 +274 @@
          */
         @Override
-        public Set<List<? extends Event<?>>> generateValidSequences(int length) {
+        public Collection<List<? extends Event<?>>> generateValidSequences(int length) {
                 // check for min-length implicitly done by generateSequences
-                Set<List<? extends Event<?>>> allSequences = generateSequences(length,
+                Collection<List<? extends Event<?>>> allSequences = generateSequences(length,
                                 true);
-                Set<List<? extends Event<?>>> validSequences = new LinkedHashSet<List<? extends Event<?>>>();
+                Collection<List<? extends Event<?>>> validSequences = new LinkedHashSet<List<? extends Event<?>>>();
                 for (List<? extends Event<?>> sequence : allSequences) {
                         if (sequence.size() == length

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/TrieNode.java

@@ -3 +3 @@
 import java.io.Serializable;
 import java.security.InvalidParameterException;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -22 +23 @@
         private final T symbol;
         
-        private List<TrieNode<T>> children;
+        private Collection<TrieNode<T>> children;
         
         TrieNode() {
@@ -96 +97 @@
         
         // returns all symbols that follow this node
-        public List<T> getFollowingSymbols() {
-                List<T> followingSymbols = new LinkedList<T>();
+        public Collection<T> getFollowingSymbols() {
+                Collection<T> followingSymbols = new LinkedList<T>();
                 for( TrieNode<T> child : children ) {
                         followingSymbols.add(child.getSymbol());