Import Upstream version 0.6.5~20141030

5 files changed, 8 insertions, 10 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionAxisRangeVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionAxisRangeVisualization.java
index 6e2a9329..266c702b 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionAxisRangeVisualization.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionAxisRangeVisualization.java
@@ -96,7 +96,7 @@ public class SelectionAxisRangeVisualization extends AbstractVisFactory {
    * @apiviz.has SelectionResult oneway - - visualizes

    * @apiviz.has RangeSelection oneway - - visualizes

    */

-  public class Instance extends AbstractParallelVisualization<NumberVector<?>> {

+  public class Instance extends AbstractParallelVisualization<NumberVector> {

     /**

      * CSS Class for the range marker

      */

diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionLineVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionLineVisualization.java
index 92e5f64c..a0efe2c3 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionLineVisualization.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionLineVisualization.java
@@ -98,7 +98,7 @@ public class SelectionLineVisualization extends AbstractVisFactory {
    * 

    * @apiviz.has SelectionResult oneway - - visualizes

    */

-  public class Instance extends AbstractParallelVisualization<NumberVector<?>> implements DataStoreListener {

+  public class Instance extends AbstractParallelVisualization<NumberVector> implements DataStoreListener {

     /**

      * CSS Class for the range marker

      */

diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolAxisRangeVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolAxisRangeVisualization.java
index 4fd00023..c2ea272e 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolAxisRangeVisualization.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolAxisRangeVisualization.java
@@ -74,8 +74,7 @@ public class SelectionToolAxisRangeVisualization extends AbstractVisFactory {
   private static final String NAME = "Axis Range Selection";

 

   /**

-   * Constructor, adhering to

-   * {@link de.lmu.ifi.dbs.elki.utilities.optionhandling.Parameterizable}

+   * Constructor.

    */

   public SelectionToolAxisRangeVisualization() {

     super();

@@ -112,7 +111,7 @@ public class SelectionToolAxisRangeVisualization extends AbstractVisFactory {
    * @apiviz.has SelectionResult oneway - - updates

    * @apiviz.has RangeSelection oneway - - updates

    */

-  public class Instance extends AbstractParallelVisualization<NumberVector<?>> implements DragableArea.DragListener {

+  public class Instance extends AbstractParallelVisualization<NumberVector> implements DragableArea.DragListener {

     /**

      * Generic tag to indicate the type of element. Used in IDs, CSS-Classes

      * etc.

@@ -273,7 +272,7 @@ public class SelectionToolAxisRangeVisualization extends AbstractVisFactory {
         selection.clear();

 

         candidates: for(DBIDIter iditer = relation.iterDBIDs(); iditer.valid(); iditer.advance()) {

-          NumberVector<?> dbTupel = relation.get(iditer);

+          NumberVector dbTupel = relation.get(iditer);

           for(int i = 0; i < dim; i++) {

             if(ranges != null && ranges[i] != null) {

               if(dbTupel.doubleValue(i) < ranges[i].first || dbTupel.doubleValue(i) > ranges[i].second) {

diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolLineVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolLineVisualization.java
index b7296492..907c8fc6 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolLineVisualization.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolLineVisualization.java
@@ -77,8 +77,7 @@ public class SelectionToolLineVisualization extends AbstractVisFactory {
   }

 

   /**

-   * Constructor, adhering to

-   * {@link de.lmu.ifi.dbs.elki.utilities.optionhandling.Parameterizable}

+   * Constructor.
    */

   public SelectionToolLineVisualization() {

     super();

@@ -115,7 +114,7 @@ public class SelectionToolLineVisualization extends AbstractVisFactory {
    * @apiviz.has SelectionResult oneway - - updates

    * @apiviz.has DBIDSelection oneway - - updates

    */

-  public class Instance extends AbstractParallelVisualization<NumberVector<?>> implements DragableArea.DragListener {

+  public class Instance extends AbstractParallelVisualization<NumberVector> implements DragableArea.DragListener {

     /**

      * CSS class of the selection rectangle while selecting.

      */

diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/package-info.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/package-info.java
index 52acab59..4f763940 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/package-info.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/package-info.java
@@ -5,7 +5,7 @@
  This file is part of ELKI:
  Environment for Developing KDD-Applications Supported by Index-Structures
 
- Copyright (C) 2013
+ Copyright (C) 2014
  Ludwig-Maximilians-Universität München
  Lehr- und Forschungseinheit für Datenbanksysteme
  ELKI Development Team