diff options
Diffstat (limited to 'src/tutorial/distancefunction/TutorialDistanceFunction.java')
-rw-r--r-- | src/tutorial/distancefunction/TutorialDistanceFunction.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tutorial/distancefunction/TutorialDistanceFunction.java b/src/tutorial/distancefunction/TutorialDistanceFunction.java index 0b225c61..e41f8093 100644 --- a/src/tutorial/distancefunction/TutorialDistanceFunction.java +++ b/src/tutorial/distancefunction/TutorialDistanceFunction.java @@ -37,14 +37,14 @@ import de.lmu.ifi.dbs.elki.distance.distancefunction.AbstractVectorDoubleDistanc */ public class TutorialDistanceFunction extends AbstractVectorDoubleDistanceFunction { @Override - public double doubleDistance(NumberVector<?, ?> o1, NumberVector<?, ?> o2) { - double dx = (o1.doubleValue(1) - o2.doubleValue(1)); - double dy = (o1.doubleValue(2) - o2.doubleValue(2)); + public double doubleDistance(NumberVector<?> o1, NumberVector<?> o2) { + double dx = (o1.doubleValue(0) - o2.doubleValue(0)); + double dy = (o1.doubleValue(1) - o2.doubleValue(1)); return dx * dx + Math.abs(dy); } @Override - public SimpleTypeInformation<? super NumberVector<?, ?>> getInputTypeRestriction() { - return new VectorFieldTypeInformation<NumberVector<?, ?>>(NumberVector.class, 2); + public SimpleTypeInformation<? super NumberVector<?>> getInputTypeRestriction() { + return new VectorFieldTypeInformation<NumberVector<?>>(NumberVector.class, 2); } }
\ No newline at end of file |