diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/density/DensityEstimationOverlay.java')
-rw-r--r-- | src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/density/DensityEstimationOverlay.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/density/DensityEstimationOverlay.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/density/DensityEstimationOverlay.java index 28e4da32..c07bc571 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/density/DensityEstimationOverlay.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/density/DensityEstimationOverlay.java @@ -24,12 +24,13 @@ package de.lmu.ifi.dbs.elki.visualization.visualizers.scatterplot.density; */ import java.awt.image.BufferedImage; import java.util.Arrays; +import java.util.Collection; import java.util.Comparator; import org.apache.batik.util.SVGConstants; import org.w3c.dom.Element; -import de.lmu.ifi.dbs.elki.database.ids.DBID; +import de.lmu.ifi.dbs.elki.database.ids.DBIDIter; import de.lmu.ifi.dbs.elki.math.MathUtil; import de.lmu.ifi.dbs.elki.math.MeanVariance; import de.lmu.ifi.dbs.elki.result.HierarchicalResult; @@ -37,7 +38,6 @@ import de.lmu.ifi.dbs.elki.result.KMLOutputHandler; import de.lmu.ifi.dbs.elki.result.Result; import de.lmu.ifi.dbs.elki.result.ResultUtil; import de.lmu.ifi.dbs.elki.utilities.documentation.Reference; -import de.lmu.ifi.dbs.elki.utilities.iterator.IterableIterator; import de.lmu.ifi.dbs.elki.visualization.VisualizationTask; import de.lmu.ifi.dbs.elki.visualization.batikutil.ThumbnailRegistryEntry; import de.lmu.ifi.dbs.elki.visualization.projections.CanvasSize; @@ -124,8 +124,8 @@ public class DensityEstimationOverlay extends AbstractScatterplotVisualization { double[][] data = new double[rel.size()][]; { int i = 0; - for(DBID id : rel.iterDBIDs()) { - data[i] = proj.fastProjectDataToRenderSpace(rel.get(id)); + for(DBIDIter iditer = rel.iterDBIDs(); iditer.valid(); iditer.advance()) { + data[i] = proj.fastProjectDataToRenderSpace(rel.get(iditer)); i++; } } @@ -206,7 +206,7 @@ public class DensityEstimationOverlay extends AbstractScatterplotVisualization { * @author Erich Schubert * * @apiviz.stereotype factory - * @apiviz.uses DensityEstimation2DVisualization oneway - - «create» + * @apiviz.uses DensityEstimationOverlay oneway - - «create» */ public static class Factory extends AbstractVisFactory { /** @@ -224,7 +224,7 @@ public class DensityEstimationOverlay extends AbstractScatterplotVisualization { @Override public void processNewResult(HierarchicalResult baseResult, Result result) { - IterableIterator<ScatterPlotProjector<?>> ps = ResultUtil.filteredResults(result, ScatterPlotProjector.class); + Collection<ScatterPlotProjector<?>> ps = ResultUtil.filterResults(result, ScatterPlotProjector.class); for(ScatterPlotProjector<?> p : ps) { final VisualizationTask task = new VisualizationTask(NAME, p.getRelation(), p.getRelation(), this); task.put(VisualizationTask.META_LEVEL, VisualizationTask.LEVEL_DATA + 1); |