summaryrefslogtreecommitdiff
path: root/src/de/lmu/ifi/dbs/elki/data/projection/NumericalFeatureSelection.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/data/projection/NumericalFeatureSelection.java')
-rw-r--r--src/de/lmu/ifi/dbs/elki/data/projection/NumericalFeatureSelection.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/data/projection/NumericalFeatureSelection.java b/src/de/lmu/ifi/dbs/elki/data/projection/NumericalFeatureSelection.java
index 158866c1..56831b96 100644
--- a/src/de/lmu/ifi/dbs/elki/data/projection/NumericalFeatureSelection.java
+++ b/src/de/lmu/ifi/dbs/elki/data/projection/NumericalFeatureSelection.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.data.projection;
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
@@ -44,9 +44,11 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntListParameter;
*
* @author Erich Schubert
*
+ * @apiviz.uses NumberVector
+ *
* @param <V> Vector type
*/
-public class NumericalFeatureSelection<V extends NumberVector<?>> implements Projection<V, V> {
+public class NumericalFeatureSelection<V extends NumberVector> implements Projection<V, V> {
/**
* Minimum dimensionality required for projection.
*/
@@ -55,7 +57,7 @@ public class NumericalFeatureSelection<V extends NumberVector<?>> implements Pro
/**
* Object factory.
*/
- private NumberVector.Factory<V, ?> factory;
+ private NumberVector.Factory<V> factory;
/**
* Output dimensionality.
@@ -84,10 +86,11 @@ public class NumericalFeatureSelection<V extends NumberVector<?>> implements Pro
this.mindim = mind;
}
+ @SuppressWarnings("unchecked")
@Override
public void initialize(SimpleTypeInformation<V> in) {
final VectorFieldTypeInformation<V> vin = (VectorFieldTypeInformation<V>) in;
- factory = (NumberVector.Factory<V, ?>) vin.getFactory();
+ factory = (NumberVector.Factory<V>) vin.getFactory();
if(vin.getDimensionality() < mindim) {
throw new AbortException("Data does not have enough dimensions for this projection!");
}
@@ -109,7 +112,7 @@ public class NumericalFeatureSelection<V extends NumberVector<?>> implements Pro
@Override
public TypeInformation getInputDataTypeInformation() {
- return new VectorTypeInformation<>(NumberVector.class, mindim, Integer.MAX_VALUE);
+ return VectorTypeInformation.typeRequest(NumberVector.class, mindim, Integer.MAX_VALUE);
}
/**
@@ -119,7 +122,7 @@ public class NumericalFeatureSelection<V extends NumberVector<?>> implements Pro
*
* @apiviz.exclude
*/
- public static class Parameterizer<V extends NumberVector<?>> extends AbstractParameterizer {
+ public static class Parameterizer<V extends NumberVector> extends AbstractParameterizer {
/**
* Dimensions to select.
*/