Changeset 241 for trunk/EventBenchConsole

Timestamp:

10/05/11 18:45:03 (13 years ago)

Author:

sherbold

Message:

• some changes to command parameter orders
• removed command printRandomSesssion
• renamed command loadSessionsFromClickstream do loadWebSequences

Location:

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

Files:

• commands/CMDcalcCoverage.java (modified) (2 diffs)
• commands/CMDgenerateRandomSequences.java (modified) (2 diffs)
• commands/CMDgenerateReplayfile.java (modified) (2 diffs)
• commands/CMDload.java (modified) (1 diff)
• commands/CMDprintRandomSession.java (deleted)
• commands/CMDsave.java (modified) (1 diff)
• commands/CMDsequenceStatistics.java (modified) (5 diffs)
• commands/CMDshowTimer.java (modified) (1 diff)
• web/commands/CMDloadWebSequences.java (moved) (moved from trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java) (2 diffs)

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

@@ -34 +34 @@
         public void run(List<Object> parameters) {
                 String modelname;
+                String observedName;
                 String[] sequenceNames;
                 int minLength;
                 int maxLength;
-                String observedName = "sequences";
                 try {
                         modelname = (String) parameters.get(0);
-                        sequenceNames = (String[]) parameters.get(1);
-                        minLength = Integer.parseInt((String) parameters.get(2));
-                        maxLength = Integer.parseInt((String) parameters.get(3));
-                        if (parameters.size() == 5) {
-                                observedName = (String) parameters.get(4);
-                        }
+                        observedName = (String) parameters.get(1);
+                        sequenceNames = (String[]) parameters.get(2);
+                        minLength = Integer.parseInt((String) parameters.get(3));
+                        maxLength = Integer.parseInt((String) parameters.get(4));
                 } catch (Exception e) {
                         throw new InvalidParameterException();
@@ -138 +136 @@
         @Override
         public void help() {
-                Console.println("Usage: calcCoverage <modelname> [sequenceNames] <minCovLength> <maxCovLength>");
+                Console.println("Usage: calcCoverage <modelname> <observedSequences> [sequenceNames] <minCovLength> <maxCovLength>");
         }
 

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

@@ -33 +33 @@
                 String sequencesName;
                 int numSessions;
-                long maxIter;
                 int minLength = 0;
                 int maxLength = Integer.MAX_VALUE;
+                long maxIter;
                 try {
                         modelname = (String) parameters.get(0);
                         sequencesName = (String) parameters.get(1);
                         numSessions = Integer.parseInt((String) parameters.get(2));
+                        minLength = Integer.parseInt((String) parameters.get(3));
+                        maxLength = Integer.parseInt((String) parameters.get(4));
                         maxIter = numSessions * 10;
-                        if (parameters.size() >= 4) {
-                                maxIter = Long.parseLong((String) parameters.get(3));
-                        }
                         if (parameters.size() >= 5) {
-                                minLength = Integer.parseInt((String) parameters.get(4));
-                        }
-                        if (parameters.size() >= 6) {
-                                maxLength = Integer.parseInt((String) parameters.get(5));
+                                maxIter = Long.parseLong((String) parameters.get(5));
                         }
                 } catch (Exception e) {
@@ -94 +90 @@
         @Override
         public void help() {
-                Console.println("Usage: generateRandomSequenecs <modelName> <sequencesName> <numSessions> {<maxIter> <minLength> <maxLength>}");
+                Console.println("Usage: generateRandomSequenecs <modelName> <sequencesName> <numSessions> <minLength> <maxLength> {<maxIter>}");
         }
 

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

@@ -30 +30 @@
         @Override
         public void help() {
-                Console.println("Usage: generateReplayfile <filename> {<sequences>}");
+                Console.println("Usage: generateReplayfile <filename> <sequences>");
         }
 
@@ -41 +41 @@
         @Override
         public void run(List<Object> parameters) {
-                if (parameters.size() < 1) {
+                String filename;
+                String sequencesName;
+                try {
+                        filename = (String) parameters.get(0);
+                        sequencesName = (String) parameters.get(1);
+                } catch (Exception e) {
                         throw new InvalidParameterException();
-                }
-                String filename = (String) parameters.get(0);
-                String sequencesName = "sequences";
-                if (parameters.size() == 2) {
-                        sequencesName = (String) parameters.get(1);
                 }
 

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

@@ -56 +56 @@
         @Override
         public void help() {
-                Console.println("Usage: loadObject <filename>");
+                Console.println("Usage: load <filename>");
         }
 

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

@@ -54 +54 @@
         @Override
         public void help() {
-                Console.println("Usage: saveObject <filename>");
+                Console.println("Usage: save <filename>");
         }
 

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

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.commands;
 
+import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.List;
@@ -33 +34 @@
         @Override
         public void run(List<Object> parameters) {
-                String sequencesName = "sequences";
-                if (parameters.size() == 1) {
+                String sequencesName;
+                try {
                         sequencesName = (String) parameters.get(0);
+                } catch (Exception e) {
+                        throw new InvalidParameterException();
                 }
 
@@ -52 +55 @@
 
                 sequences = (Collection<List<Event<?>>>) dataObject;
-                Console.traceln("Number of Sequences: " + sequences.size());
+                Console.println("Number of Sequences: " + sequences.size());
                 SortedMap<Integer, Integer> lengthMap = new TreeMap<Integer, Integer>();
                 for (List<Event<?>> sequence : sequences) {
@@ -63 +66 @@
                 }
                 for (Entry<Integer, Integer> entry : lengthMap.entrySet()) {
-                        Console.traceln("Of length " + entry.getKey() + ": "
+                        Console.println("Of length " + entry.getKey() + ": "
                                         + entry.getValue());
                 }
@@ -75 +78 @@
         @Override
         public void help() {
-                Console.println("Usage: sequenceStatistics {<sequencesName>}");
+                Console.println("Usage: sequenceStatistics <sequencesName>");
         }
 

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

@@ -46 +46 @@
                 long startTime = (Long) dataObject;
                 long currentTime = System.currentTimeMillis();
-                Console.println("" + (currentTime - startTime) + " miliseconds");
+                Console.println("" + (currentTime - startTime) + " milliseconds");
         }
 

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

@@ -23 +23 @@
  * @version 1.0
  */
-public class CMDloadSessionsFromClickstream implements Command {
+public class CMDloadWebSequences implements Command {
 
         /*
@@ -112 +112 @@
         @Override
         public void help() {
-                Console.println("Usage: loadSessionsFromClickstream <filename> <sequencesName> {<serverUrl>} {<timeout> <minSessionLength> <maxSessionLength>} {<generateFrequentUsers> <frequentUserThreshold>}");
+                Console.println("Usage: loadWebSequences <filename> <sequencesName> {<serverUrl>} {<timeout> <minSessionLength> <maxSessionLength>} {<generateFrequentUsers> <frequentUserThreshold>}");
         }