Cleanup: redundant implements, missing new generics

elki-project · Feb 27, 2024 · a0f982e · a0f982e
1 parent 5245f1b
commit a0f982e
Show file tree

Hide file tree

Showing 36 changed files with 90 additions and 89 deletions.
diff --git a/...s/src/main/java/elki/visualization/visualizers/pairsegments/CircleSegmentsVisualizer.java b/...s/src/main/java/elki/visualization/visualizers/pairsegments/CircleSegmentsVisualizer.java
@@ -38,7 +38,6 @@
 import elki.evaluation.clustering.pairsegments.Segments;
 import elki.logging.Logging;
 import elki.math.MathUtil;
-import elki.result.ResultListener;
 import elki.utilities.datastructures.iterator.It;
 import elki.utilities.documentation.Reference;
 import elki.utilities.exceptions.AbortException;
@@ -132,7 +131,7 @@ public void processNewResult(VisualizerContext context, Object start) {
    * @assoc - - - Segments
    * @has - - - SegmentsStylingPolicy
    */
-  public static class Instance extends AbstractVisualization implements ResultListener {
+  public static class Instance extends AbstractVisualization {
     /** Minimum width (radian) of Segment */
     private static final double SEGMENT_MIN_ANGLE = 0.01;
 

diff --git a/...ikvis/src/main/java/elki/visualization/visualizers/parallel/BoundingBoxVisualization.java b/...ikvis/src/main/java/elki/visualization/visualizers/parallel/BoundingBoxVisualization.java
@@ -25,7 +25,6 @@
 
 import elki.data.spatial.SpatialComparable;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.ids.DBIDIter;
 import elki.database.ids.DBIDRef;
 import elki.database.ids.DBIDs;
@@ -98,7 +97,7 @@ public void processNewResult(VisualizerContext context, Object start) {
    *
    * @author Robert Rödler
    */
-  public class Instance extends AbstractParallelVisualization<SpatialComparable> implements DataStoreListener {
+  public class Instance extends AbstractParallelVisualization<SpatialComparable> {
     /**
      * Generic tags to indicate the type of element. Used in IDs, CSS-Classes
      * etc.

diff --git a/addons/batikvis/src/main/java/elki/visualization/visualizers/parallel/LineVisualization.java b/addons/batikvis/src/main/java/elki/visualization/visualizers/parallel/LineVisualization.java
@@ -25,7 +25,6 @@
 
 import elki.data.NumberVector;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.ids.DBIDIter;
 import elki.database.ids.DBIDRef;
 import elki.database.ids.DBIDs;
@@ -94,7 +93,7 @@ public void processNewResult(VisualizerContext context, Object start) {
    *
    * @author Robert Rödler
    */
-  public class Instance extends AbstractParallelVisualization<NumberVector> implements DataStoreListener {
+  public class Instance extends AbstractParallelVisualization<NumberVector> {
     /**
      * Generic tags to indicate the type of element. Used in IDs, CSS-Classes
      * etc.

diff --git a/...ain/java/elki/visualization/visualizers/parallel/cluster/ClusterOutlineVisualization.java b/...ain/java/elki/visualization/visualizers/parallel/cluster/ClusterOutlineVisualization.java
@@ -29,7 +29,6 @@
 import elki.data.NumberVector;
 import elki.data.model.Model;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.ids.DBIDIter;
 import elki.database.ids.DBIDs;
 import elki.database.relation.Relation;
@@ -118,7 +117,7 @@ public boolean allowThumbnails(VisualizationTask task) {
    * @author Robert Rödler
    * @author Erich Schubert
    */
-  public class Instance extends AbstractParallelVisualization<NumberVector> implements DataStoreListener {
+  public class Instance extends AbstractParallelVisualization<NumberVector> {
     /**
      * Generic tags to indicate the type of element. Used in IDs, CSS-Classes
      * etc.

diff --git a/...ava/elki/visualization/visualizers/parallel/cluster/ClusterParallelMeanVisualization.java b/...ava/elki/visualization/visualizers/parallel/cluster/ClusterParallelMeanVisualization.java
@@ -30,7 +30,6 @@
 import elki.data.model.Model;
 import elki.data.model.PrototypeModel;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.datastore.ObjectNotFoundException;
 import elki.database.ids.DBIDRef;
 import elki.database.relation.Relation;
@@ -103,7 +102,7 @@ public boolean allowThumbnails(VisualizationTask task) {
    * @author Robert Rödler
    *
    */
-  public class Instance extends AbstractParallelVisualization<NumberVector> implements DataStoreListener {
+  public class Instance extends AbstractParallelVisualization<NumberVector> {
     /**
      * Generic tags to indicate the type of element. Used in IDs, CSS-Classes
      * etc.

diff --git a/...c/main/java/elki/visualization/visualizers/parallel/index/RTreeParallelVisualization.java b/...c/main/java/elki/visualization/visualizers/parallel/index/RTreeParallelVisualization.java
@@ -25,7 +25,6 @@
 
 import elki.data.NumberVector;
 import elki.data.spatial.SpatialUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.index.tree.LeafEntry;
 import elki.index.tree.spatial.SpatialEntry;
 import elki.index.tree.spatial.rstarvariants.AbstractRStarTree;
@@ -111,7 +110,7 @@ public void processNewResult(VisualizerContext context, Object start) {
    * @param <N> Tree node type
    * @param <E> Tree entry type
    */
-  public class Instance<N extends AbstractRStarTreeNode<N, E>, E extends SpatialEntry> extends AbstractParallelVisualization<NumberVector> implements DataStoreListener {
+  public class Instance<N extends AbstractRStarTreeNode<N, E>, E extends SpatialEntry> extends AbstractParallelVisualization<NumberVector> {
     /**
      * The tree we visualize
      */

diff --git a/...in/java/elki/visualization/visualizers/parallel/selection/SelectionLineVisualization.java b/...in/java/elki/visualization/visualizers/parallel/selection/SelectionLineVisualization.java
@@ -25,7 +25,6 @@
 
 import elki.data.NumberVector;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.ids.DBIDIter;
 import elki.database.ids.DBIDRef;
 import elki.database.ids.DBIDs;
@@ -96,7 +95,7 @@ public void processNewResult(VisualizerContext context, Object start) {
    *
    * @navhas - visualizes - DBIDSelection
    */
-  public class Instance extends AbstractParallelVisualization<NumberVector> implements DataStoreListener {
+  public class Instance extends AbstractParallelVisualization<NumberVector> {
     /**
      * CSS Class for the range marker
      */

diff --git a/...rc/main/java/elki/visualization/visualizers/scatterplot/AbstractTooltipVisualization.java b/...rc/main/java/elki/visualization/visualizers/scatterplot/AbstractTooltipVisualization.java
@@ -27,7 +27,6 @@
 import org.w3c.dom.events.EventListener;
 import org.w3c.dom.events.EventTarget;
 
-import elki.database.datastore.DataStoreListener;
 import elki.database.ids.DBIDIter;
 import elki.database.ids.DBIDRef;
 import elki.logging.LoggingUtil;
@@ -46,7 +45,7 @@
  * @since 0.4.0
  */
 // TODO: can we improve performance by not adding as many hovers?
-public abstract class AbstractTooltipVisualization extends AbstractScatterplotVisualization implements DataStoreListener {
+public abstract class AbstractTooltipVisualization extends AbstractScatterplotVisualization {
   /**
    * Generic tag to indicate the type of element. Used in IDs, CSS-Classes etc.
    */

diff --git a/...tikvis/src/main/java/elki/visualization/visualizers/scatterplot/PolygonVisualization.java b/...tikvis/src/main/java/elki/visualization/visualizers/scatterplot/PolygonVisualization.java
@@ -25,7 +25,6 @@
 import elki.data.spatial.Polygon;
 import elki.data.spatial.PolygonsObject;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.datastore.ObjectNotFoundException;
 import elki.database.ids.DBIDIter;
 import elki.database.relation.Relation;
@@ -98,7 +97,7 @@ public void processNewResult(VisualizerContext context, Object result) {
    *
    * @has - visualizes - PolygonsObject
    */
-  public static class Instance extends AbstractScatterplotVisualization implements DataStoreListener {
+  public static class Instance extends AbstractScatterplotVisualization {
     /**
      * Generic tag to indicate the type of element. Used in IDs, CSS-Classes
      * etc.

diff --git a/...in/java/elki/visualization/visualizers/scatterplot/cluster/ClusterOrderVisualization.java b/...in/java/elki/visualization/visualizers/scatterplot/cluster/ClusterOrderVisualization.java
@@ -25,7 +25,6 @@
 
 import elki.clustering.optics.ClusterOrder;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.ids.DBIDIter;
 import elki.database.ids.DBIDUtil;
 import elki.database.ids.DBIDVar;
@@ -96,7 +95,7 @@ public void processNewResult(VisualizerContext context, Object start) {
    * @navhas - visualizes - ClusterOrder
    */
   // TODO: listen for CLUSTER ORDER changes.
-  public static class Instance extends AbstractScatterplotVisualization implements DataStoreListener {
+  public static class Instance extends AbstractScatterplotVisualization {
     /**
      * CSS class name
      */

diff --git a/.../src/main/java/elki/visualization/visualizers/scatterplot/index/TreeMBRVisualization.java b/.../src/main/java/elki/visualization/visualizers/scatterplot/index/TreeMBRVisualization.java
@@ -24,15 +24,14 @@
 import org.w3c.dom.Element;
 
 import elki.data.spatial.SpatialComparable;
-import elki.database.datastore.DataStoreListener;
 import elki.index.tree.LeafEntry;
 import elki.index.tree.spatial.SpatialEntry;
 import elki.index.tree.spatial.rstarvariants.AbstractRStarTree;
 import elki.index.tree.spatial.rstarvariants.AbstractRStarTreeNode;
 import elki.index.tree.spatial.rstarvariants.rstar.RStarTreeNode;
 import elki.utilities.datastructures.BitsUtil;
-import elki.utilities.optionhandling.Parameterizer;
 import elki.utilities.optionhandling.OptionID;
+import elki.utilities.optionhandling.Parameterizer;
 import elki.utilities.optionhandling.parameterization.Parameterization;
 import elki.utilities.optionhandling.parameters.Flag;
 import elki.visualization.VisualizationTask;
@@ -114,7 +113,7 @@ public void processNewResult(VisualizerContext context, Object start) {
    * @param <E> Tree entry type
    */
   // TODO: listen for tree changes instead of data changes?
-  public class Instance<N extends AbstractRStarTreeNode<N, E>, E extends SpatialEntry> extends AbstractScatterplotVisualization implements DataStoreListener {
+  public class Instance<N extends AbstractRStarTreeNode<N, E>, E extends SpatialEntry> extends AbstractScatterplotVisualization {
     /**
      * The tree we visualize
      */

diff --git a/...c/main/java/elki/visualization/visualizers/scatterplot/index/TreeSphereVisualization.java b/...c/main/java/elki/visualization/visualizers/scatterplot/index/TreeSphereVisualization.java
@@ -25,7 +25,6 @@
 
 import elki.data.NumberVector;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.ids.DBID;
 import elki.database.relation.Relation;
 import elki.distance.Distance;
@@ -162,7 +161,7 @@ public static boolean canVisualize(Relation<?> rel, AbstractMTree<?, ?, ?, ?> tr
    * @param <E> Tree entry type
    */
   // TODO: listen for tree changes!
-  public class Instance<N extends AbstractMTreeNode<?, N, E>, E extends MTreeEntry> extends AbstractScatterplotVisualization implements DataStoreListener {
+  public class Instance<N extends AbstractMTreeNode<?, N, E>, E extends MTreeEntry> extends AbstractScatterplotVisualization {
     protected double p;
 
     /**

diff --git a/...src/main/java/elki/visualization/visualizers/scatterplot/outlier/BubbleVisualization.java b/...src/main/java/elki/visualization/visualizers/scatterplot/outlier/BubbleVisualization.java
@@ -25,7 +25,6 @@
 
 import elki.data.NumberVector;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.ids.DBIDIter;
 import elki.database.ids.DBIDRef;
 import elki.database.relation.Relation;
@@ -146,7 +145,7 @@ public void processNewResult(VisualizerContext context, Object start) {
    *
    * @navhas - visualizes - OutlierResult
    */
-  public class Instance extends AbstractScatterplotVisualization implements DataStoreListener {
+  public class Instance extends AbstractScatterplotVisualization {
     /**
      * The outlier result to visualize
      */

diff --git a/.../main/java/elki/visualization/visualizers/scatterplot/outlier/COPVectorVisualization.java b/.../main/java/elki/visualization/visualizers/scatterplot/outlier/COPVectorVisualization.java
@@ -23,13 +23,12 @@
 import org.apache.batik.util.SVGConstants;
 import org.w3c.dom.Element;
 
-import elki.outlier.COP;
 import elki.data.NumberVector;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.ids.DBIDIter;
 import elki.database.relation.Relation;
 import elki.math.linearalgebra.VMath;
+import elki.outlier.COP;
 import elki.result.outlier.OutlierResult;
 import elki.utilities.documentation.Reference;
 import elki.utilities.documentation.Title;
@@ -113,7 +112,7 @@ public void processNewResult(VisualizerContext context, Object start) {
    *
    * @author Erich Schubert
    */
-  public static class Instance extends AbstractScatterplotVisualization implements DataStoreListener {
+  public static class Instance extends AbstractScatterplotVisualization {
     /**
      * Generic tag to indicate the type of element. Used in IDs, CSS-Classes
      * etc.

diff --git a/...a/elki/visualization/visualizers/scatterplot/selection/DistanceFunctionVisualization.java b/...a/elki/visualization/visualizers/scatterplot/selection/DistanceFunctionVisualization.java
@@ -20,17 +20,26 @@
  */
 package elki.visualization.visualizers.scatterplot.selection;
 
-import static elki.math.linearalgebra.VMath.*;
+import static elki.math.linearalgebra.VMath.euclideanLength;
+import static elki.math.linearalgebra.VMath.minus;
+import static elki.math.linearalgebra.VMath.minusEquals;
+import static elki.math.linearalgebra.VMath.plusEquals;
+import static elki.math.linearalgebra.VMath.plusTimes;
+import static elki.math.linearalgebra.VMath.plusTimesEquals;
+import static elki.math.linearalgebra.VMath.scalarProduct;
+import static elki.math.linearalgebra.VMath.timesEquals;
 
 import org.apache.batik.util.SVGConstants;
 import org.w3c.dom.Element;
 
 import elki.data.NumberVector;
 import elki.data.VectorUtil;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.datastore.ObjectNotFoundException;
-import elki.database.ids.*;
+import elki.database.ids.DBIDIter;
+import elki.database.ids.DBIDs;
+import elki.database.ids.DoubleDBIDListIter;
+import elki.database.ids.KNNList;
 import elki.database.relation.Relation;
 import elki.distance.ArcCosineDistance;
 import elki.distance.CosineDistance;
@@ -57,7 +66,6 @@
 import elki.visualization.visualizers.VisFactory;
 import elki.visualization.visualizers.Visualization;
 import elki.visualization.visualizers.scatterplot.AbstractScatterplotVisualization;
-
 import net.jafama.DoubleWrapper;
 import net.jafama.FastMath;
 
@@ -207,7 +215,7 @@ public static Element drawCosine(SVGPlot svgp, Projection2D proj, NumberVector m
    *
    * @navhas - visualizes - DBIDSelection
    */
-  public static class Instance extends AbstractScatterplotVisualization implements DataStoreListener {
+  public static class Instance extends AbstractScatterplotVisualization {
     /**
      * Tags to indicate the type of element. Used in IDs, CSS-Classes etc.
      */

diff --git a/...lki/visualization/visualizers/scatterplot/selection/SelectionConvexHullVisualization.java b/...lki/visualization/visualizers/scatterplot/selection/SelectionConvexHullVisualization.java
@@ -24,7 +24,6 @@
 
 import elki.data.spatial.Polygon;
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.datastore.ObjectNotFoundException;
 import elki.database.ids.DBIDIter;
 import elki.database.ids.DBIDs;
@@ -97,7 +96,7 @@ public void processNewResult(VisualizerContext context, Object start) {
    * @navhas - visualizes - DBIDSelection
    * @assoc - - - GrahamScanConvexHull2D
    */
-  public static class Instance extends AbstractScatterplotVisualization implements DataStoreListener {
+  public static class Instance extends AbstractScatterplotVisualization {
     /**
      * Generic tag to indicate the type of element. Used in IDs, CSS-Classes
      * etc.

diff --git a/.../java/elki/visualization/visualizers/scatterplot/selection/SelectionDotVisualization.java b/.../java/elki/visualization/visualizers/scatterplot/selection/SelectionDotVisualization.java
@@ -24,7 +24,6 @@
 import org.w3c.dom.Element;
 
 import elki.data.type.TypeUtil;
-import elki.database.datastore.DataStoreListener;
 import elki.database.datastore.ObjectNotFoundException;
 import elki.database.ids.DBIDIter;
 import elki.database.relation.Relation;
@@ -93,7 +92,7 @@ public void processNewResult(VisualizerContext context, Object start) {
    *
    * @navhas - visualizes - DBIDSelection
    */
-  public static class Instance extends AbstractScatterplotVisualization implements DataStoreListener {
+  public static class Instance extends AbstractScatterplotVisualization {
     /**
      * Generic tag to indicate the type of element. Used in IDs, CSS-Classes
      * etc.

diff --git a/.../batikvis/src/main/java/elki/visualization/visualizers/thumbs/ThumbnailVisualization.java b/.../batikvis/src/main/java/elki/visualization/visualizers/thumbs/ThumbnailVisualization.java
@@ -25,13 +25,11 @@
 import org.apache.batik.util.SVGConstants;
 import org.w3c.dom.Element;
 
-import elki.database.datastore.DataStoreListener;
 import elki.logging.Logging;
 import elki.logging.LoggingUtil;
 import elki.result.SamplingResult;
 import elki.result.SelectionResult;
 import elki.visualization.VisualizationItem;
-import elki.visualization.VisualizationListener;
 import elki.visualization.VisualizationTask;
 import elki.visualization.VisualizationTask.UpdateFlag;
 import elki.visualization.VisualizerContext;
@@ -53,7 +51,7 @@
  *
  * @assoc - - - ThumbnailThread
  */
-public class ThumbnailVisualization extends AbstractVisualization implements ThumbnailThread.Listener, DataStoreListener, VisualizationListener {
+public class ThumbnailVisualization extends AbstractVisualization implements ThumbnailThread.Listener {
   /**
    * Visualizer factory
    */

diff --git a/...ustering/src/main/java/elki/clustering/hierarchical/extraction/CutDendrogramByHeight.java b/...ustering/src/main/java/elki/clustering/hierarchical/extraction/CutDendrogramByHeight.java
@@ -20,9 +20,8 @@
  */
 package elki.clustering.hierarchical.extraction;
 
-import elki.clustering.ClusteringAlgorithm;
-import elki.clustering.hierarchical.HierarchicalClusteringAlgorithm;
 import elki.clustering.hierarchical.ClusterMergeHistory;
+import elki.clustering.hierarchical.HierarchicalClusteringAlgorithm;
 import elki.data.Clustering;
 import elki.data.model.DendrogramModel;
 import elki.logging.Logging;
@@ -40,7 +39,7 @@
  * @assoc - - - HierarchicalClusteringAlgorithm
  * @assoc - - - PointerHierarchyResult
  */
-public class CutDendrogramByHeight extends AbstractCutDendrogram implements ClusteringAlgorithm<Clustering<DendrogramModel>> {
+public class CutDendrogramByHeight extends AbstractCutDendrogram {
   /**
    * Class logger.
    */

diff --git a/...rc/main/java/elki/clustering/hierarchical/extraction/CutDendrogramByNumberOfClusters.java b/...rc/main/java/elki/clustering/hierarchical/extraction/CutDendrogramByNumberOfClusters.java
@@ -20,9 +20,8 @@
  */
 package elki.clustering.hierarchical.extraction;
 
-import elki.clustering.ClusteringAlgorithm;
-import elki.clustering.hierarchical.HierarchicalClusteringAlgorithm;
 import elki.clustering.hierarchical.ClusterMergeHistory;
+import elki.clustering.hierarchical.HierarchicalClusteringAlgorithm;
 import elki.data.Clustering;
 import elki.data.model.DendrogramModel;
 import elki.logging.Logging;
@@ -41,7 +40,7 @@
  * @assoc - - - HierarchicalClusteringAlgorithm
  * @assoc - - - PointerHierarchyResult
  */
-public class CutDendrogramByNumberOfClusters extends AbstractCutDendrogram implements ClusteringAlgorithm<Clustering<DendrogramModel>> {
+public class CutDendrogramByNumberOfClusters extends AbstractCutDendrogram {
   /**
    * Class logger.
    */