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

Timestamp:

09/28/11 03:03:13 (13 years ago)

Author:

sherbold

Message:

• greatly improved type checking and consistency of type checking for objects checked out of the GlobalDataContainer?

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsequenceStatistics.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.util.TreeMap;
 
+import de.ugoe.cs.eventbench.SequenceInstanceOf;
 import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
@@ -39 +40 @@
                 Object dataObject = GlobalDataContainer.getInstance().getData(
                                 sequencesName);
+                if (dataObject == null) {
+                        Console.println("Object " + sequencesName
+                                        + " not found in storage.");
+                        return;
+                }
+                if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) {
+                        Console.println("Object " + sequencesName
+                                        + "not of type Collection<List<Event<?>>>.");
+                        return;
+                }
 
-                try {
-                        sequences = (Collection<List<Event<?>>>) dataObject;
-                        Console.traceln("Number of Sequences: " + sequences.size());
-                        SortedMap<Integer, Integer> lengthMap = new TreeMap<Integer, Integer>();
-                        for (List<Event<?>> sequence : sequences) {
-                                Integer currentSize = sequence.size();
-                                if (lengthMap.containsKey(currentSize)) {
-                                        lengthMap.put(currentSize, lengthMap.get(currentSize) + 1);
-                                } else {
-                                        lengthMap.put(currentSize, 1);
-                                }
+                sequences = (Collection<List<Event<?>>>) dataObject;
+                Console.traceln("Number of Sequences: " + sequences.size());
+                SortedMap<Integer, Integer> lengthMap = new TreeMap<Integer, Integer>();
+                for (List<Event<?>> sequence : sequences) {
+                        Integer currentSize = sequence.size();
+                        if (lengthMap.containsKey(currentSize)) {
+                                lengthMap.put(currentSize, lengthMap.get(currentSize) + 1);
+                        } else {
+                                lengthMap.put(currentSize, 1);
                         }
-                        for (Entry<Integer, Integer> entry : lengthMap.entrySet()) {
-                                Console.traceln("Of length " + entry.getKey() + ": "
-                                                + entry.getValue());
-                        }
-
-                } catch (ClassCastException e) {
-                        Console.println("Sequences not found");
+                }
+                for (Entry<Integer, Integer> entry : lengthMap.entrySet()) {
+                        Console.traceln("Of length " + entry.getKey() + ": "
+                                        + entry.getValue());
                 }
         }