diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/utilities/referencepoints/AxisBasedReferencePoints.java')
-rw-r--r-- | src/de/lmu/ifi/dbs/elki/utilities/referencepoints/AxisBasedReferencePoints.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/utilities/referencepoints/AxisBasedReferencePoints.java b/src/de/lmu/ifi/dbs/elki/utilities/referencepoints/AxisBasedReferencePoints.java index 24829d98..d8544cd4 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/referencepoints/AxisBasedReferencePoints.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/referencepoints/AxisBasedReferencePoints.java @@ -32,7 +32,7 @@ import de.lmu.ifi.dbs.elki.database.relation.RelationUtil; import de.lmu.ifi.dbs.elki.utilities.DatabaseUtil; import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer; import de.lmu.ifi.dbs.elki.utilities.optionhandling.OptionID; -import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.GreaterEqualConstraint; +import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.CommonConstraints; import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameterization; import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.DoubleParameter; import de.lmu.ifi.dbs.elki.utilities.pairs.Pair; @@ -83,7 +83,7 @@ public class AxisBasedReferencePoints<V extends NumberVector<?>> implements Refe // Compute mean and extend from minmax. double[] mean = new double[dim]; double[] delta = new double[dim]; - for (int d = 0; d < dim; d++) { + for(int d = 0; d < dim; d++) { mean[d] = (minmax.first.doubleValue(d) + minmax.second.doubleValue(d)) * .5; delta[d] = spacescale * (minmax.second.doubleValue(d) - mean[d]); } @@ -92,21 +92,22 @@ public class AxisBasedReferencePoints<V extends NumberVector<?>> implements Refe double[] vec = new double[dim]; // Use min and max - for (int d = 0; d < dim; d++) { + for(int d = 0; d < dim; d++) { vec[d] = mean[d] - delta[d]; } result.add(factory.newNumberVector(vec)); - for (int d = 0; d < dim; d++) { + for(int d = 0; d < dim; d++) { vec[d] = mean[d] + delta[d]; } result.add(factory.newNumberVector(vec)); // Plus axis end points: - for (int i = 0; i < dim; i++) { - for (int d = 0; d < dim; d++) { - if (d != i) { + for(int i = 0; i < dim; i++) { + for(int d = 0; d < dim; d++) { + if(d != i) { vec[d] = mean[d] - delta[d]; - } else { + } + else { vec[d] = mean[d] + delta[d]; } } @@ -133,8 +134,8 @@ public class AxisBasedReferencePoints<V extends NumberVector<?>> implements Refe protected void makeOptions(Parameterization config) { super.makeOptions(config); DoubleParameter spacescaleP = new DoubleParameter(SPACE_SCALE_ID, 1.0); - spacescaleP.addConstraint(new GreaterEqualConstraint(0.0)); - if (config.grab(spacescaleP)) { + spacescaleP.addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_DOUBLE); + if(config.grab(spacescaleP)) { spacescale = spacescaleP.getValue(); } } |