Changeset 116 for trunk

Timestamp:

07/12/11 16:29:12 (13 years ago)

Author:

sherbold

Message:

• changed signature of commands trainMarkovModel and trainPPM

Location:

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

Files:

• CMDtrainMarkovModel.java (modified) (1 diff)
• CMDtrainPPM.java (modified) (3 diffs)

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

@@ -28 +28 @@
                         modelname = (String) parameters.get(0);
                         if( parameters.size()==2 ) {
-                                order = Integer.parseInt((String) parameters.get(0));
+                                order = Integer.parseInt((String) parameters.get(1));
                         }
                 } catch (Exception e) {

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

@@ -15 +15 @@
         @Override
         public void help() {
-                Console.println("Usage: trainPPM <modelName> <order>");
+                Console.println("Usage: trainPPM <modelName> <probEscape> <maxOrder> {<minOrder>}");
         }
 
@@ -22 +22 @@
         public void run(List<Object> parameters) {
                 String modelname;
-                int order;
+                double probEscape;
+                int maxOrder;
+                int minOrder = 0;
                 try {
                         modelname = (String) parameters.get(0);
-                        order = Integer.parseInt((String) parameters.get(1));
+                        probEscape = Double.parseDouble((String) parameters.get(1));
+                        maxOrder = Integer.parseInt((String) parameters.get(2));
+                        if( parameters.size()==4 ) {
+                                minOrder = Integer.parseInt((String) parameters.get(3));
+                        }
                 } catch (Exception e) {
                         throw new InvalidParameterException();
@@ -37 +43 @@
                         if( sequences.size()>0 ) {
                                 if( sequences.get(0).get(0) instanceof Event ) {
-                                        PredictionByPartialMatch model = new PredictionByPartialMatch(order, new Random());
+                                        PredictionByPartialMatch model = new PredictionByPartialMatch(maxOrder, minOrder, new Random(), probEscape);
                                         model.train(sequences);
                                         if( GlobalDataContainer.getInstance().addData(modelname, model) ) {