Changeset 18 for trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDcalcEntropy.java

Timestamp:

04/14/11 11:12:06 (13 years ago)

Author:

sherbold

Message:

• removed all reference to de.ugoe.cs.eventbench.MarkovModel? and replaced them with de.ugoe.cs.eventbench.models.FirstOrderMarkovModel? and de.ugoe.cs.eventbench.models.IStochasticProcess

File:

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

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

@@ -4 +4 @@
 
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.markov.MarkovModel;
+import de.ugoe.cs.eventbench.models.FirstOrderMarkovModel;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
@@ -25 +25 @@
                 }
                 
-                MarkovModel model = null; 
+                FirstOrderMarkovModel model = null; 
                 Object dataObject = GlobalDataContainer.getInstance().getData(modelname);
                 if( dataObject==null ) {
                         Console.println("Model " + modelname + "not found in storage.");
                 }
-                else if( !(dataObject instanceof MarkovModel) ) {
-                        Console.println("Object " + modelname + " is not a markov model!");
+                else if( !(dataObject instanceof FirstOrderMarkovModel) ) {
+                        Console.println("Object " + modelname + " is not a first-order Markov model!");
                 } else {
-                        model = (MarkovModel) dataObject;
+                        model = (FirstOrderMarkovModel) dataObject;
                         double entropy = model.calcEntropy();
                         if( Double.isNaN(entropy) ) {