Changeset 324

Timestamp:

12/16/11 10:17:25 (13 years ago)

Author:

sherbold

Message:

• changed signature of de.ugoe.cs.util.eventbench.models.TrieBasedModel?.train() and update() from using Collection<List<Event<?>>> to Collection<List<? extends Event<?>>>

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench

Files:

• commands/AbstractTrainCommand.java (modified) (1 diff)
• commands/CMDupdateModel.java (modified) (1 diff)
• efg/EFGModelGenerator.java (modified) (4 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/AbstractTrainCommand.java

@@ -81 +81 @@
                         return;
                 }
-                Collection<List<Event<?>>> sequences = (Collection<List<Event<?>>>) dataObject;
+                Collection<List<? extends Event<?>>> sequences = (Collection<List<? extends Event<?>>>) dataObject;
 
                 TrieBasedModel model = createModel();

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDupdateModel.java

@@ -52 +52 @@
                         return;
                 }
-                Collection<List<Event<?>>> sequences = (Collection<List<Event<?>>>) dataObject;
+                Collection<List<? extends Event<?>>> sequences = (Collection<List<? extends Event<?>>>) dataObject;
 
                 dataObject = GlobalDataContainer.getInstance().getData(modelname);

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/EFGModelGenerator.java

@@ -44 +44 @@
                 EFG efg = (EFG) IO.readObjFromFile(efgFileName, EFG.class);
 
-                Collection<List<Event<?>>> subsequences = generateEdgeSequences(efg);
+                Collection<List<? extends Event<?>>> subsequences = generateEdgeSequences(efg);
                 FirstOrderMarkovModel model = new FirstOrderMarkovModel(new Random());
                 model.train(subsequences);
@@ -63 +63 @@
                 EFG efg = (EFG) IO.readObjFromFile(efgFileName, EFG.class);
 
-                Collection<List<Event<?>>> subsequences = generateEdgeSequences(efg);
+                Collection<List<? extends Event<?>>> subsequences = generateEdgeSequences(efg);
                 DeterministicFiniteAutomaton model = new DeterministicFiniteAutomaton(
                                 new Random());
@@ -81 +81 @@
          * @return edge sequence set
          */
-        private Collection<List<Event<?>>> generateEdgeSequences(EFG efg) {
+        private Collection<List<? extends Event<?>>> generateEdgeSequences(EFG efg) {
                 List<Event<?>> events = createEvents(efg);
                 /*
@@ -89 +89 @@
                  */
                 EventGraphType efgGraph = efg.getEventGraph();
-                Collection<List<Event<?>>> subsequences = new LinkedList<List<Event<?>>>();
+                Collection<List<? extends Event<?>>> subsequences = new LinkedList<List<? extends Event<?>>>();
 
                 int efgSize = events.size();