JAL-2629 choice of hmm profile now a parameter not a selection, apis simplified

[jalview.git] / src / jalview / ws / params / simple / LogarithmicParameter.java

diff --git a/src/jalview/ws/params/simple/LogarithmicParameter.java b/src/jalview/ws/params/simple/LogarithmicParameter.java
index 91ed03a..5f57d54 100644 (file)
--- a/src/jalview/ws/params/simple/LogarithmicParameter.java
+++ b/src/jalview/ws/params/simple/LogarithmicParameter.java
@@ -4,17 +4,23 @@ import jalview.ws.params.ParameterI;
 import jalview.ws.params.ValueConstrainI;
 
 /**
+ * A model for a numeric-valued parameter which should be displayed using a
+ * logarithmic scale
  * 
  * @author TZVanaalten
  *
  */
 public class LogarithmicParameter extends Option implements ParameterI
 {
-  Double defval;
+  public static final double LOGSLIDERSCALE = 1000000D;
 
-  Double min, max;
+  final double defval;
 
-  Double base;
+  final double min;
+
+  final double max;
+
+  final double base;
 
   @Override
   public ValueConstrainI getValidValue()
@@ -31,27 +37,13 @@ public class LogarithmicParameter extends Option implements ParameterI
       @Override
       public Number getMin()
       {
-        if (min < max)
-        {
-          return min;
-        }
-        else
-        {
-          return null;
-        }
+        return min < max ? min : null;
       }
 
       @Override
       public Number getMax()
       {
-        if (min < max)
-        {
-          return max;
-        }
-        else
-        {
-          return null;
-        }
+        return min < max ? max : null;
       }
     };
   }
@@ -61,30 +53,31 @@ public class LogarithmicParameter extends Option implements ParameterI
     super(parm);
     max = parm.max;
     min = parm.min;
+    defval = 0D;
     base = parm.base;
   }
 
   public LogarithmicParameter(String name, String description,
-          boolean required, Double defValue, Double min, Double max,
-          Double base)
+          boolean required, double defValue, double min, double max,
+          double base)
   {
     super(name, description, required, String.valueOf(defValue), null, null,
             null);
     defval = defValue;
-    this.min = min * 1000000;
-    this.max = max * 1000000;
+    this.min = min;// * LOGSLIDERSCALE;
+    this.max = max;// * LOGSLIDERSCALE;
     this.base = base;
   }
 
   public LogarithmicParameter(String name, String description,
-          boolean required, Double defValue, Double value, Double min,
-          Double max, Double base)
+          boolean required, double defValue, double value, double min,
+          double max, double base)
   {
     super(name, description, required, String.valueOf(defValue),
             String.valueOf(value), null, null);
     defval = defValue;
-    this.min = min * 1000000;
-    this.max = max * 1000000;
+    this.min = min;// * LOGSLIDERSCALE;
+    this.max = max;// * LOGSLIDERSCALE;
     this.base = base;
   }
 
@@ -94,7 +87,7 @@ public class LogarithmicParameter extends Option implements ParameterI
     return new LogarithmicParameter(this);
   }
 
-  public Double getBase()
+  public double getBase()
   {
     return base;
   }