diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/data/model/DendrogramModel.java')
-rw-r--r-- | src/de/lmu/ifi/dbs/elki/data/model/DendrogramModel.java | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/data/model/DendrogramModel.java b/src/de/lmu/ifi/dbs/elki/data/model/DendrogramModel.java index ac1c53f0..ba89a031 100644 --- a/src/de/lmu/ifi/dbs/elki/data/model/DendrogramModel.java +++ b/src/de/lmu/ifi/dbs/elki/data/model/DendrogramModel.java @@ -1,28 +1,28 @@ package de.lmu.ifi.dbs.elki.data.model;
-/* -This file is part of ELKI: -Environment for Developing KDD-Applications Supported by Index-Structures - -Copyright (C) 2013 -Ludwig-Maximilians-Universität München -Lehr- und Forschungseinheit für Datenbanksysteme -ELKI Development Team - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
+/*
+ This file is part of ELKI:
+ Environment for Developing KDD-Applications Supported by Index-Structures +
+ Copyright (C) 2014
+ Ludwig-Maximilians-Universität München
+ Lehr- und Forschungseinheit für Datenbanksysteme
+ ELKI Development Team +
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version. +
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details. +
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
import de.lmu.ifi.dbs.elki.result.textwriter.TextWriteable;
import de.lmu.ifi.dbs.elki.result.textwriter.TextWriterStream;
@@ -32,18 +32,18 @@ import de.lmu.ifi.dbs.elki.result.textwriter.TextWriterStream; * @author Elke Achtert
*/
// TODO: comments
-public class DendrogramModel<D extends Distance<D>> extends BaseModel {
+public class DendrogramModel extends AbstractModel {
/**
* Distance to child cluster
*/
- private D distance;
+ private double distance;
/**
* Constructor.
- *
+ *
* @param distance Distance to child cluster.
*/
- public DendrogramModel(D distance) {
+ public DendrogramModel(double distance) {
super();
this.distance = distance;
}
@@ -51,7 +51,7 @@ public class DendrogramModel<D extends Distance<D>> extends BaseModel { /**
* @return the distance
*/
- public D getDistance() {
+ public double getDistance() {
return distance;
}
@@ -61,11 +61,11 @@ public class DendrogramModel<D extends Distance<D>> extends BaseModel { @Override
public void writeToText(TextWriterStream out, String label) {
super.writeToText(out, label);
- out.commentPrintLn("Distance to children: " + (distance != null ? distance.toString() : "null"));
+ out.commentPrintLn("Distance to children: " + distance);
}
@Override
public String toString() {
- return "Distance to children: " + (distance != null ? distance.toString() : "null");
+ return "Distance to children: " + distance;
}
}
|