Changeset 203

Timestamp:

09/27/11 20:09:17 (13 years ago)

Author:

sherbold

Message:

• Changed data type for handling of sequence-sets. Before, List<List<Event<?>>> was used, now Collection<List<Event<?>>> is used.

Location:

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

Files:

• ReplayGenerator.java (modified) (2 diffs)
• commands/AbstractTrainCommand.java (modified) (3 diffs)
• commands/CMDgenerateRandomReplay.java (modified) (2 diffs)
• commands/CMDgenerateReplayfile.java (modified) (3 diffs)
• commands/CMDsequenceStatistics.java (modified) (2 diffs)
• commands/CMDshowSequences.java (modified) (2 diffs)
• commands/CMDupdateModel.java (modified) (3 diffs)
• web/WeblogParser.java (modified) (2 diffs)
• windows/LogParser.java (modified) (3 diffs)
• windows/commands/CMDparseXML.java (modified) (2 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/ReplayGenerator.java

@@ -5 +5 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.util.Collection;
 import java.util.List;
 
@@ -50 +51 @@
          */
         public void createLogfileMultipleSessions(
-                        List<List<ReplayableEvent<?>>> sequences, String filename) {
+                        Collection<List<ReplayableEvent<?>>> sequences, String filename) {
                 OutputStreamWriter writer = openReplayFile(filename);
                 if (writer != null) {
                         try {
-                                decorator = sequences.get(0).get(0).getReplayDecorator();
+                                decorator = sequences.iterator().next().get(0).getReplayDecorator();
                                 if (decorator != null) {
                                         writer.write(decorator.getHeader());

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

@@ -2 +2 @@
 
 import java.security.InvalidParameterException;
+import java.util.Collection;
 import java.util.List;
 
@@ -68 +69 @@
                 }
 
-                List<List<Event<?>>> sequences = null;
+                Collection<List<Event<?>>> sequences = null;
                 Object dataObject = GlobalDataContainer.getInstance().getData(
                                 sequencesName);
@@ -77 +78 @@
                 }
                 try {
-                        sequences = (List<List<Event<?>>>) dataObject;
+                        sequences = (Collection<List<Event<?>>>) dataObject;
                 } catch (ClassCastException e) {
                         Console.println("Object " + sequencesName
-                                        + "not of type List<List<Event<?>>>.");
+                                        + "not of type Collection<List<Event<?>>>.");
+                        return;
                 }
+                /* TODO implement better type check
                 if (sequences.size() == 0 || !(sequences.get(0).get(0) instanceof Event) ) {
                         Console.println("Object " + sequencesName
-                                        + "not of type List<List<Event<?>>>.");
+                                        + "not of type Collection<List<Event<?>>>.");
                         return;
                 }
+                */
 
                 TrieBasedModel model = createModel();

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

@@ -2 +2 @@
 
 import java.security.InvalidParameterException;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -62 +63 @@
                 } else {
                         model = (IStochasticProcess) dataObject;
-                        List<List<ReplayableEvent<?>>> sequences = new LinkedList<List<ReplayableEvent<?>>>();
+                        Collection<List<ReplayableEvent<?>>> sequences = new LinkedList<List<ReplayableEvent<?>>>();
                         try {
                                 for (int i = 0; i < numSessions; i++) {

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

@@ -2 +2 @@
 
 import java.security.InvalidParameterException;
+import java.util.Collection;
 import java.util.List;
 
@@ -41 +42 @@
                 }
                 
-                List<List<ReplayableEvent<?>>> sequences = null;
+                Collection<List<ReplayableEvent<?>>> sequences = null;
                 Object dataObject = GlobalDataContainer.getInstance().getData(sequencesName);
                         
                 try {
-                        sequences = (List<List<ReplayableEvent<?>>>) dataObject;
+                        sequences = (Collection<List<ReplayableEvent<?>>>) dataObject;
                         ReplayGenerator generator = new ReplayGenerator();
-                        if( sequences!=null && sequences.size()>0 && sequences.get(0).get(0) instanceof Event ) {
+                        if( sequences!=null && sequences.size()>0 && sequences.iterator().next().get(0) instanceof Event ) {
                                 generator.createLogfileMultipleSessions(sequences, filename);
                         } else {
@@ -53 +54 @@
                                 if( sequencesName.equals("sequences") ) { 
                                         Console.traceln("Illegal use of \"sequences\" parameter in the GlobalDataContainer.");
-                                        Console.traceln("The parameter should always be of type List<List<Event>>!");
+                                        Console.traceln("The parameter should always be of type Collection<List<Event>>!");
                                 }
                         }

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

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.commands;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map.Entry;
@@ -35 +36 @@
                 }
 
-                List<List<Event<?>>> sequences = null;
+                Collection<List<Event<?>>> sequences = null;
                 Object dataObject = GlobalDataContainer.getInstance().getData(
                                 sequencesName);
 
                 try {
-                        sequences = (List<List<Event<?>>>) dataObject;
+                        sequences = (Collection<List<Event<?>>>) dataObject;
                         Console.traceln("Number of Sequences: " + sequences.size());
                         SortedMap<Integer, Integer> lengthMap = new TreeMap<Integer, Integer>();

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

@@ -2 +2 @@
 
 import java.security.InvalidParameterException;
+import java.util.Collection;
 import java.util.List;
 
@@ -22 +23 @@
                         throw new InvalidParameterException();
 
-                List<List<Event<?>>> containedSequences = null;
+                Collection<List<Event<?>>> containedSequences = null;
 
                 try {
-                        containedSequences = (List<List<Event<?>>>) GlobalDataContainer
+                        containedSequences = (Collection<List<Event<?>>>) GlobalDataContainer
                                         .getInstance().getData("sequences");
                 } catch (ClassCastException e) {

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

@@ -2 +2 @@
 
 import java.security.InvalidParameterException;
+import java.util.Collection;
 import java.util.List;
 
@@ -38 +39 @@
                 }
 
-                List<List<Event<?>>> sequences = null;
+                Collection<List<Event<?>>> sequences = null;
                 Object dataObject = GlobalDataContainer.getInstance().getData(
                                 sequencesName);
@@ -47 +48 @@
                 }
                 try {
-                        sequences = (List<List<Event<?>>>) dataObject;
+                        sequences = (Collection<List<Event<?>>>) dataObject;
                 } catch (ClassCastException e) {
                         Console.println("Object " + sequencesName
-                                        + "not of type List<List<Event<?>>>.");
+                                        + "not of type Collection<List<Event<?>>>.");
                 }
                 if (sequences.size() == 0
-                                || !(sequences.get(0).get(0) instanceof Event)) {
+                                || !(sequences.iterator().next().get(0) instanceof Event)) {
                         Console.println("Object " + sequencesName
-                                        + "not of type List<List<Event<?>>>.");
+                                        + "not of type Collection<List<Event<?>>>.");
                         return;
                 }

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/WeblogParser.java

@@ -8 +8 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -93 +94 @@
          * @return generated event sequences
          */
-        public List<List<WebEvent>> getSequences() {
+        public Collection<List<WebEvent>> getSequences() {
                 return sequences;
         }

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/LogParser.java

@@ -8 +8 @@
 import java.io.UnsupportedEncodingException;
 import java.security.InvalidParameterException;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -71 +72 @@
          * </p>
          */
-        private List<List<WindowsEvent>> sequences;
+        private Collection<List<WindowsEvent>> sequences;
 
         /**
@@ -127 +128 @@
          * @return collection of event sequences
          */
-        public List<List<WindowsEvent>> getSequences() {
+        public Collection<List<WindowsEvent>> getSequences() {
                 return sequences;
         }

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java

@@ -2 +2 @@
 
 import java.security.InvalidParameterException;
+import java.util.Collection;
 import java.util.List;
 
@@ -58 +59 @@
                 parser.parseFile(filename);
 
-                List<List<WindowsEvent>> sequences = parser.getSequences();
+                Collection<List<WindowsEvent>> sequences = parser.getSequences();
 
                 if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {