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

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

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.commands;
+
 import java.security.InvalidParameterException;
 import java.util.List;
@@ -18 +19 @@
 public class CMDcalcEntropy implements Command {
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see de.ugoe.cs.util.console.Command#help()
          */
@@ -26 +29 @@
         }
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see de.ugoe.cs.util.console.Command#run(java.util.List)
          */
@@ -37 +42 @@
                         throw new InvalidParameterException();
                 }
-                
-                FirstOrderMarkovModel model = null; 
-                Object dataObject = GlobalDataContainer.getInstance().getData(modelname);
-                if( dataObject==null ) {
+
+                FirstOrderMarkovModel model = null;
+                Object dataObject = GlobalDataContainer.getInstance()
+                                .getData(modelname);
+                if (dataObject == null) {
                         Console.println("Model " + modelname + "not found in storage.");
+                        return;
                 }
-                else if( !(dataObject instanceof FirstOrderMarkovModel) ) {
-                        Console.println("Object " + modelname + " is not a first-order Markov model!");
-                } else {
-                        model = (FirstOrderMarkovModel) dataObject;
-                        double entropy = model.calcEntropy();
-                        if( !Double.isNaN(entropy) ) {
-                                Console.println("entropy: " + entropy);
-                        }
+                if (!(dataObject instanceof FirstOrderMarkovModel)) {
+                        Console.println("Object " + modelname
+                                        + " is not a first-order Markov model!");
+                        return;
+                }
+                model = (FirstOrderMarkovModel) dataObject;
+                double entropy = model.calcEntropy();
+                if (!Double.isNaN(entropy)) {
+                        Console.println("entropy: " + entropy);
                 }
         }