Changeset 209 for trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/AbstractTrainCommand.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/AbstractTrainCommand.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.util.List;
 
+import de.ugoe.cs.eventbench.SequenceInstanceOf;
 import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
@@ -69 +70 @@
                 }
 
-                Collection<List<Event<?>>> sequences = null;
                 Object dataObject = GlobalDataContainer.getInstance().getData(
                                 sequencesName);
@@ -77 +77 @@
                         return;
                 }
-                try {
-                        sequences = (Collection<List<Event<?>>>) dataObject;
-                } catch (ClassCastException e) {
+                if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) {
                         Console.println("Object " + sequencesName
                                         + "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 Collection<List<Event<?>>>.");
-                        return;
-                }
-                */
+                Collection<List<Event<?>>> sequences = (Collection<List<Event<?>>>) dataObject;
 
                 TrieBasedModel model = createModel();
                 model.train(sequences);
-                if (GlobalDataContainer.getInstance().addData(modelname,
-                                model)) {
-                        Console.traceln("Old data \"" + modelname
-                                        + "\" overwritten");
+                if (GlobalDataContainer.getInstance().addData(modelname, model)) {
+                        Console.traceln("Old data \"" + modelname + "\" overwritten");
                 }
-                
+
         }