diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization')
10 files changed, 41 insertions, 35 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/AbstractParameterization.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/AbstractParameterization.java index 7cc0055e..75a5be86 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/AbstractParameterization.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/AbstractParameterization.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2012 + Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -46,7 +46,7 @@ public abstract class AbstractParameterization implements Parameterization { /** * Errors */ - List<ParameterException> errors = new ArrayList<ParameterException>(); + List<ParameterException> errors = new ArrayList<>(); /** * The logger of the class. @@ -89,7 +89,7 @@ public abstract class AbstractParameterization implements Parameterization { public synchronized void clearErrors() { // Do NOT use errors.clear(), since we might have an error report // referencing the collection! - errors = new ArrayList<ParameterException>(); + errors = new ArrayList<>(); } /** diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/ChainedParameterization.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/ChainedParameterization.java index a2fd168e..97cdb51f 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/ChainedParameterization.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/ChainedParameterization.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2012 + Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -44,7 +44,7 @@ public class ChainedParameterization extends AbstractParameterization { /** * Keep the list of parameterizations. */ - private List<Parameterization> chain = new ArrayList<Parameterization>(); + private List<Parameterization> chain = new ArrayList<>(); /** * Error target diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/EmptyParameterization.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/EmptyParameterization.java index 3391ff4a..02802593 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/EmptyParameterization.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/EmptyParameterization.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2012 + Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/ListParameterization.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/ListParameterization.java index 7d728280..b870b57b 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/ListParameterization.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/ListParameterization.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2012 + Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -44,7 +44,7 @@ public class ListParameterization extends AbstractParameterization { /** * The actual parameters, for storage */ - LinkedList<Pair<OptionID, Object>> parameters = new LinkedList<Pair<OptionID, Object>>(); + LinkedList<Pair<OptionID, Object>> parameters = new LinkedList<>(); /** * Default constructor. @@ -52,7 +52,7 @@ public class ListParameterization extends AbstractParameterization { public ListParameterization() { super(); } - + /** * Constructor with an existing collection. * @@ -81,9 +81,9 @@ public class ListParameterization extends AbstractParameterization { * @param value Value */ public void addParameter(OptionID optionid, Object value) { - parameters.add(new Pair<OptionID, Object>(optionid, value)); + parameters.add(new Pair<>(optionid, value)); } - + /** * Convenience - add a Flag option directly. * @@ -94,7 +94,7 @@ public class ListParameterization extends AbstractParameterization { addFlag(flag.getOptionID()); } } - + /** * Convenience - add a Parameter for forwarding * @@ -107,11 +107,11 @@ public class ListParameterization extends AbstractParameterization { } @Override - public boolean setValueForOption(Parameter<?> opt) throws ParameterException { + public boolean setValueForOption(Parameter<?> opt) throws ParameterException { Iterator<Pair<OptionID, Object>> iter = parameters.iterator(); - while(iter.hasNext()) { + while (iter.hasNext()) { Pair<OptionID, Object> pair = iter.next(); - if(pair.first == opt.getOptionID()) { + if (pair.first == opt.getOptionID()) { iter.remove(); opt.setValue(pair.second); return true; @@ -134,8 +134,8 @@ public class ListParameterization extends AbstractParameterization { return (parameters.size() > 0); } - /** {@inheritDoc} - * Default implementation, for flat parameterizations. + /** + * {@inheritDoc} Default implementation, for flat parameterizations. */ @Override public Parameterization descend(Object option) { @@ -158,11 +158,17 @@ public class ListParameterization extends AbstractParameterization { * @return Array list of parameters */ public ArrayList<String> serialize() { - ArrayList<String> params = new ArrayList<String>(); + ArrayList<String> params = new ArrayList<>(); for (Pair<OptionID, Object> pair : parameters) { params.add("-" + pair.getFirst().toString()); - params.add(pair.getSecond().toString()); + if (pair.getSecond() instanceof String) { + params.add((String) pair.getSecond()); + } else if (pair.getSecond() instanceof Class) { + params.add(((Class<?>) pair.getSecond()).getCanonicalName()); + } else { // Fallback: + params.add(pair.getSecond().toString()); + } } return params; } -}
\ No newline at end of file +} diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/MergedParameterization.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/MergedParameterization.java index 580a3371..9f765963 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/MergedParameterization.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/MergedParameterization.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2012 + Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -69,7 +69,7 @@ public class MergedParameterization implements Parameterization { super(); this.inner = child; this.current = new ListParameterization(); - this.used = new ArrayList<Pair<OptionID, Object>>(); + this.used = new ArrayList<>(); } /** diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/Parameterization.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/Parameterization.java index 5cdff013..01c46583 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/Parameterization.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/Parameterization.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2012 + Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/SerializedParameterization.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/SerializedParameterization.java index b88b7dc4..b3e3f214 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/SerializedParameterization.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/SerializedParameterization.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2012 + Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -59,7 +59,7 @@ public class SerializedParameterization extends AbstractParameterization { */ public SerializedParameterization() { super(); - parameters = new LinkedList<String>(); + parameters = new LinkedList<>(); } /** diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/TrackParameters.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/TrackParameters.java index 424f54ee..5a20bd9e 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/TrackParameters.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/TrackParameters.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2012 + Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -54,18 +54,18 @@ public class TrackParameters implements Parameterization { /** * Tracking storage */ - List<Pair<Object, Parameter<?>>> options = new ArrayList<Pair<Object, Parameter<?>>>(); + List<Pair<Object, Parameter<?>>> options = new ArrayList<>(); /** * Tree information: parent links */ - Map<Object, Object> parents = new HashMap<Object, Object>(); + Map<Object, Object> parents = new HashMap<>(); /** * Tree information: child links */ // Implementation note: we need the map to support "null" keys! - Map<Object, List<Object>> children = new HashMap<Object, List<Object>>(); + Map<Object, List<Object>> children = new HashMap<>(); /** * Current parent for nested parameterization @@ -149,10 +149,10 @@ public class TrackParameters implements Parameterization { * @return Parameters given */ public Collection<Pair<OptionID, Object>> getGivenParameters() { - ArrayList<Pair<OptionID, Object>> ret = new ArrayList<Pair<OptionID, Object>>(); + ArrayList<Pair<OptionID, Object>> ret = new ArrayList<>(); for(Pair<Object, Parameter<?>> pair : options) { if(pair.second.isDefined() && pair.second.getGivenValue() != null) { - ret.add(new Pair<OptionID, Object>(pair.second.getOptionID(), pair.second.getGivenValue())); + ret.add(new Pair<>(pair.second.getOptionID(), pair.second.getGivenValue())); } } return ret; @@ -180,7 +180,7 @@ public class TrackParameters implements Parameterization { parents.put(opt, cur); List<Object> c = children.get(cur); if(c == null) { - c = new ArrayList<Object>(); + c = new ArrayList<>(); children.put(cur, c); } if(!c.contains(opt)) { diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/UnParameterization.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/UnParameterization.java index a04b3217..2a05a766 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/UnParameterization.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/UnParameterization.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2012 + Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -45,7 +45,7 @@ public class UnParameterization implements Parameterization { /** * Errors */ - List<ParameterException> errors = new ArrayList<ParameterException>(); + List<ParameterException> errors = new ArrayList<>(); @Override public boolean hasUnusedParameters() { diff --git a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/package-info.java b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/package-info.java index 41856ad7..ce9c89b4 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/package-info.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/optionhandling/parameterization/package-info.java @@ -8,7 +8,7 @@ This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures -Copyright (C) 2012 +Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team |