Index: /trunk/EventBenchCoreTest/src/de/ugoe/cs/eventbench/models/MockTrieBasedModel.java
===================================================================
--- /trunk/EventBenchCoreTest/src/de/ugoe/cs/eventbench/models/MockTrieBasedModel.java	(revision 326)
+++ /trunk/EventBenchCoreTest/src/de/ugoe/cs/eventbench/models/MockTrieBasedModel.java	(revision 326)
@@ -0,0 +1,27 @@
+package de.ugoe.cs.eventbench.models;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import de.ugoe.cs.eventbench.data.Event;
+
+public class MockTrieBasedModel extends TrieBasedModel {
+	private static final long serialVersionUID = 1L;
+
+	public MockTrieBasedModel(int markovOrder, Random r) {
+		super(markovOrder, r);
+	}
+
+	@Override
+	public double getProbability(List<? extends Event<?>> context,
+			Event<?> symbol) {
+		List<Event<?>> list = new ArrayList<Event<?>>();
+		list.add(context.get(context.size()-1));
+		if( trie.find(list).getFollowingSymbols().contains(symbol) ) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+}
Index: /trunk/EventBenchCoreTest/src/de/ugoe/cs/eventbench/models/ModelFlattenerTest.java
===================================================================
--- /trunk/EventBenchCoreTest/src/de/ugoe/cs/eventbench/models/ModelFlattenerTest.java	(revision 325)
+++ /trunk/EventBenchCoreTest/src/de/ugoe/cs/eventbench/models/ModelFlattenerTest.java	(revision 326)
@@ -33,5 +33,5 @@
 		ModelFlattener fixture = new ModelFlattener();
 		HighOrderMarkovModel model = new HighOrderMarkovModel(2, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 		model.train(sequences);
Index: /trunk/EventBenchCoreTest/src/de/ugoe/cs/eventbench/models/TrieBasedModelTest.java
===================================================================
--- /trunk/EventBenchCoreTest/src/de/ugoe/cs/eventbench/models/TrieBasedModelTest.java	(revision 325)
+++ /trunk/EventBenchCoreTest/src/de/ugoe/cs/eventbench/models/TrieBasedModelTest.java	(revision 326)
@@ -202,24 +202,4 @@
 	}
 	
-	private class MockTrieBasedModel extends TrieBasedModel {
-		private static final long serialVersionUID = 1L;
-
-		public MockTrieBasedModel(int markovOrder, Random r) {
-			super(markovOrder, r);
-		}
-
-		@Override
-		public double getProbability(List<? extends Event<?>> context,
-				Event<?> symbol) {
-			List<Event<?>> list = new ArrayList<Event<?>>();
-			list.add(context.get(context.size()-1));
-			if( trie.find(list).getFollowingSymbols().contains(symbol) ) {
-				return 1;
-			} else {
-				return 0;
-			}
-		}
-	}
-	
 	@Test
 	public void testGenerateSequences_1()
@@ -227,5 +207,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 		fixture.train(sequences);
@@ -282,5 +262,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 		fixture.train(sequences);
@@ -320,5 +300,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 		fixture.train(sequences);
@@ -333,5 +313,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 		fixture.train(sequences);
@@ -365,5 +345,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 		fixture.train(sequences);
@@ -378,5 +358,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 
@@ -404,5 +384,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 
@@ -430,5 +410,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 		fixture.train(sequences);
@@ -455,5 +435,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 		fixture.train(sequences);
@@ -480,5 +460,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 
@@ -494,5 +474,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 		sequences.add(sequence);
@@ -510,5 +490,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = new ArrayList<List<Event<?>>>();
+		Collection<List<? extends Event<?>>> sequences = new ArrayList<List<? extends Event<?>>>();
 		sequences.add(sequence);
 		fixture.train(sequences);
@@ -525,5 +505,5 @@
 		int markovOrder = 2;
 		MockTrieBasedModel fixture = new MockTrieBasedModel(markovOrder, new Random());
-		Collection<List<Event<?>>> sequences = null;
+		Collection<List<? extends Event<?>>> sequences = null;
 		fixture.trie = null;