1 files changed, 1 insertions, 170 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameters/DistanceParameter.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameters/DistanceParameter.java
index bb9dc60c..f9943610 100644
--- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameters/DistanceParameter.java
+++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameters/DistanceParameter.java
@@ -23,13 +23,10 @@ package de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters;
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import java.util.List;
-
 import de.lmu.ifi.dbs.elki.distance.distancefunction.DistanceFunction;
 import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.OptionID;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.WrongParameterValueException;
-import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.ParameterConstraint;
 
 /**
  * Parameter class for a parameter specifying a double value.
@@ -39,177 +36,11 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.ParameterConstra
  * 
  * @param <D> Distance type 
  */
-public class DistanceParameter<D extends Distance<D>> extends Parameter<D, D> {
+public class DistanceParameter<D extends Distance<D>> extends AbstractParameter<D> {
   /**
    * Distance type
    */
   D dist;
-  
-  /**
-   * Constructs a double parameter with the given optionID, parameter
-   * constraints, and default value.
-   * 
-   * @param optionID the unique optionID
-   * @param dist distance factory
-   * @param cons a list of parameter constraints for this double parameter
-   * @param defaultValue the default value for this double parameter
-   */
-  public DistanceParameter(OptionID optionID, D dist, List<ParameterConstraint<D>> cons, D defaultValue) {
-    super(optionID, cons, defaultValue);
-    this.dist = dist;
-  }
-
-  /**
-   * Constructs a double parameter with the given optionID, parameter
-   * constraints, and default value.
-   * 
-   * @param optionID the unique optionID
-   * @param dist distance factory
-   * @param cons a list of parameter constraints for this double parameter
-   * @param defaultValue the default value for this double parameter
-   */
-  public DistanceParameter(OptionID optionID, DistanceFunction<?, D> dist, List<ParameterConstraint<D>> cons, D defaultValue) {
-    super(optionID, cons, defaultValue);
-    this.dist = (dist != null) ? dist.getDistanceFactory() : null;
-  }
-
-  /**
-   * Constructs a double parameter with the given optionID, parameter
-   * constraints, and optional flag.
-   * 
-   * @param optionID the unique optionID
-   * @param dist distance factory
-   * @param cons a list of parameter constraints for this double parameter
-   * @param optional specifies whether this parameter is an optional parameter
-   */
-  public DistanceParameter(OptionID optionID, D dist, List<ParameterConstraint<D>> cons, boolean optional) {
-    this(optionID, dist, cons);
-    setOptional(optional);
-  }
-
-  /**
-   * Constructs a double parameter with the given optionID, parameter
-   * constraints, and optional flag.
-   * 
-   * @param optionID the unique optionID
-   * @param dist distance factory
-   * @param cons a list of parameter constraints for this double parameter
-   * @param optional specifies whether this parameter is an optional parameter
-   */
-  public DistanceParameter(OptionID optionID, DistanceFunction<?, D> dist, List<ParameterConstraint<D>> cons, boolean optional) {
-    this(optionID, dist, cons);
-    setOptional(optional);
-  }
-
-  /**
-   * Constructs a double parameter with the given optionID, and parameter
-   * constraints.
-   * 
-   * @param optionID the unique optionID
-   * @param dist distance factory
-   * @param constraints a list of parameter constraints for this double
-   *        parameter
-   */
-  public DistanceParameter(OptionID optionID, D dist, List<ParameterConstraint<D>> constraints) {
-    super(optionID, constraints);
-    this.dist = dist;
-  }
-
-  /**
-   * Constructs a double parameter with the given optionID, and parameter
-   * constraints.
-   * 
-   * @param optionID the unique optionID
-   * @param dist distance factory
-   * @param constraints a list of parameter constraints for this double
-   *        parameter
-   */
-  public DistanceParameter(OptionID optionID, DistanceFunction<?, D> dist, List<ParameterConstraint<D>> constraints) {
-    super(optionID, constraints);
-    this.dist = (dist != null) ? dist.getDistanceFactory() : null;
-  }
-
-  /**
-   * Constructs a double parameter with the given optionID, parameter
-   * constraint, and default value.
-   * 
-   * @param optionID the unique id of this parameter
-   * @param dist distance factory
-   * @param constraint the constraint of this parameter
-   * @param defaultValue the default value for this parameter
-   */
-  public DistanceParameter(OptionID optionID, D dist, ParameterConstraint<D> constraint, D defaultValue) {
-    super(optionID, constraint, defaultValue);
-    this.dist = dist;
-  }
-
-  /**
-   * Constructs a double parameter with the given optionID, parameter
-   * constraint, and default value.
-   * 
-   * @param optionID the unique id of this parameter
-   * @param dist distance factory
-   * @param constraint the constraint of this parameter
-   * @param defaultValue the default value for this parameter
-   */
-  public DistanceParameter(OptionID optionID, DistanceFunction<?, D> dist, ParameterConstraint<D> constraint, D defaultValue) {
-    super(optionID, constraint, defaultValue);
-    this.dist = (dist != null) ? dist.getDistanceFactory() : null;
-  }
-
-  /**
-   * Constructs a double parameter with the given optionID, parameter
-   * constraint, and optional flag.
-   * 
-   * @param optionID the unique id of this parameter
-   * @param dist distance factory
-   * @param constraint the constraint of this parameter
-   * @param optional specifies whether this parameter is an optional parameter
-   */
-  public DistanceParameter(OptionID optionID, D dist, ParameterConstraint<D> constraint, boolean optional) {
-    super(optionID, constraint, optional);
-    this.dist = dist;
-  }
-
-  /**
-   * Constructs a double parameter with the given optionID, parameter
-   * constraint, and optional flag.
-   * 
-   * @param optionID the unique id of this parameter
-   * @param dist distance factory
-   * @param constraint the constraint of this parameter
-   * @param optional specifies whether this parameter is an optional parameter
-   */
-  public DistanceParameter(OptionID optionID, DistanceFunction<?, D> dist, ParameterConstraint<D> constraint, boolean optional) {
-    super(optionID, constraint, optional);
-    this.dist = (dist != null) ? dist.getDistanceFactory() : null;
-  }
-
-  /**
-   * Constructs a double parameter with the given optionID, and parameter
-   * constraint.
-   * 
-   * @param optionID the unique id of this parameter
-   * @param dist distance factory
-   * @param constraint the constraint of this parameter
-   */
-  public DistanceParameter(OptionID optionID, D dist, ParameterConstraint<D> constraint) {
-    super(optionID, constraint);
-    this.dist = dist;
-  }
-
-  /**
-   * Constructs a double parameter with the given optionID, and parameter
-   * constraint.
-   * 
-   * @param optionID the unique id of this parameter
-   * @param dist distance factory
-   * @param constraint the constraint of this parameter
-   */
-  public DistanceParameter(OptionID optionID, DistanceFunction<?, D> dist, ParameterConstraint<D> constraint) {
-    super(optionID, constraint);
-    this.dist = (dist != null) ? dist.getDistanceFactory() : null;
-  }
 
   /**
    * Constructs a double parameter with the given optionID and default value.