Changeset 84 for trunk

Timestamp:

06/23/11 11:26:57 (13 years ago)

Author:

sherbold

Message:

+ added command generateRandomSequences

• changed command generateReplayfile such that it accepts an optional parameter with the name of the sequences that are to be written, to allow writing sequences generated with generateRandomSequences
• minor output changes

Location:

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

Files:

• commands/CMDgenerateRandomSequences.java (added)
• commands/CMDgenerateReplayfile.java (modified) (3 diffs)
• commands/CMDtrainMarkovModel.java (modified) (1 diff)
• commands/CMDtrainPPM.java (modified) (1 diff)
• web/commands/CMDloadSessionsFromClickstream.java (modified) (1 diff)
• windows/commands/CMDparseXML.java (modified) (1 diff)

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

@@ -15 +15 @@
         @Override
         public void help() {
-                Console.println("Usage: generateReplayfile <filename>");                
+                Console.println("Usage: generateReplayfile <filename> {<sequences>}");          
         }
 
@@ -25 +25 @@
                 }
                 String filename = (String) parameters.get(0);
+                String sequencesName = "sequences";
+                if( parameters.size()==2 ) {
+                        sequencesName = (String) parameters.get(0);
+                }
                 
                 List<List<ReplayableEvent<?>>> sequences = null;
-                Object dataObject = GlobalDataContainer.getInstance().getData("sequences");
+                Object dataObject = GlobalDataContainer.getInstance().getData(sequencesName);
                         
                 try {
@@ -36 +40 @@
                                         generator.createLogfileMultipleSessions(sequences, filename);
                                 } else {
-                                        Console.traceln("Illegal use of \"sequences\" parameter in the GlobalDataContainer.");
-                                        Console.traceln("The parameter should always be of type List<List<Event>>!");
+                                        Console.printerrln("Loaded data not are not sequences!");
+                                        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>>!");
+                                        }
                                 }
                         }
                 }
                 catch(ClassCastException e) {
-                        Console.printerrln("Sequences need to be loaded first using parseXML");
+                        Console.printerrln("Sequences not found");
                 }
                 

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

@@ -49 +49 @@
                                         model.train(sequences);
                                         if( GlobalDataContainer.getInstance().addData(modelname, model) ) {
-                                                Console.traceln("Old model overwritten");
+                                                Console.traceln("Old data \"" + modelname + "\" overwritten");
                                         }
                                 } else {

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

@@ -40 +40 @@
                                         model.train(sequences);
                                         if( GlobalDataContainer.getInstance().addData(modelname, model) ) {
-                                                Console.traceln("Old model overwritten");
+                                                Console.traceln("Old data \"" + modelname + "\" overwritten");
                                         }                                       
                                 } else {

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java

@@ -43 +43 @@
                 }
                 
-                GlobalDataContainer.getInstance().addData("sequences", parser.getSequences());
+                if( GlobalDataContainer.getInstance().addData("sequences", parser.getSequences()) ) {
+                        Console.traceln("Old data \"" + "sequences" + "\" overwritten");
+                }
         }
         

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

@@ -36 +36 @@
                 List<List<WindowsEvent>> sequences = parser.getSequences();
                 
-                GlobalDataContainer.getInstance().addData("sequences", sequences);              
+                if( GlobalDataContainer.getInstance().addData("sequences", sequences ) ) {
+                        Console.traceln("Old data \"" + "sequences" + "\" overwritten");
+                }       
         }