1 files changed, 12 insertions, 12 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/math/linearalgebra/pca/PCARunner.java b/src/de/lmu/ifi/dbs/elki/math/linearalgebra/pca/PCARunner.java
index 661fa5c5..4fb9dbdf 100644
--- a/src/de/lmu/ifi/dbs/elki/math/linearalgebra/pca/PCARunner.java
+++ b/src/de/lmu/ifi/dbs/elki/math/linearalgebra/pca/PCARunner.java
@@ -23,12 +23,11 @@ package de.lmu.ifi.dbs.elki.math.linearalgebra.pca;
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import java.util.Collection;
 
 import de.lmu.ifi.dbs.elki.data.NumberVector;
 import de.lmu.ifi.dbs.elki.database.ids.DBIDs;
-import de.lmu.ifi.dbs.elki.database.query.DistanceResultPair;
 import de.lmu.ifi.dbs.elki.database.relation.Relation;
+import de.lmu.ifi.dbs.elki.distance.distanceresultlist.DistanceDBIDResult;
 import de.lmu.ifi.dbs.elki.distance.distancevalue.NumberDistance;
 import de.lmu.ifi.dbs.elki.math.linearalgebra.EigenvalueDecomposition;
 import de.lmu.ifi.dbs.elki.math.linearalgebra.Matrix;
@@ -57,7 +56,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter;
  * 
  * @param <V> Vector type
  */
-public class PCARunner<V extends NumberVector<? extends V, ?>> implements Parameterizable {
+public class PCARunner<V extends NumberVector<?>> implements Parameterizable {
   /**
    * Parameter to specify the class to compute the covariance matrix, must be a
    * subclass of {@link CovarianceMatrixBuilder}.
@@ -68,7 +67,7 @@ public class PCARunner<V extends NumberVector<? extends V, ?>> implements Parame
    * Key: {@code -pca.covariance}
    * </p>
    */
-  public static final OptionID PCA_COVARIANCE_MATRIX = OptionID.getOrCreateOptionID("pca.covariance", "Class used to compute the covariance matrix.");
+  public static final OptionID PCA_COVARIANCE_MATRIX = new OptionID("pca.covariance", "Class used to compute the covariance matrix.");
 
   /**
    * The covariance computation class.
@@ -86,7 +85,7 @@ public class PCARunner<V extends NumberVector<? extends V, ?>> implements Parame
   }
 
   /**
-   * Run PCA on the complete database
+   * Run PCA on the complete database.
    * 
    * @param database the database used
    * @return PCA result
@@ -96,7 +95,7 @@ public class PCARunner<V extends NumberVector<? extends V, ?>> implements Parame
   }
 
   /**
-   * Run PCA on a collection of database IDs
+   * Run PCA on a collection of database IDs.
    * 
    * @param ids a collection of ids
    * @param database the database used
@@ -107,18 +106,19 @@ public class PCARunner<V extends NumberVector<? extends V, ?>> implements Parame
   }
 
   /**
-   * Run PCA on a QueryResult Collection
+   * Run PCA on a QueryResult Collection.
    * 
    * @param results a collection of QueryResults
    * @param database the database used
+   * @param <D> distance type
    * @return PCA result
    */
-  public <D extends NumberDistance<?, ?>> PCAResult processQueryResult(Collection<? extends DistanceResultPair<D>> results, Relation<? extends V> database) {
+  public <D extends NumberDistance<D, ?>> PCAResult processQueryResult(DistanceDBIDResult<D> results, Relation<? extends V> database) {
     return processCovarMatrix(covarianceMatrixBuilder.processQueryResults(results, database));
   }
 
   /**
-   * Process an existing covariance Matrix
+   * Process an existing covariance Matrix.
    * 
    * @param covarMatrix the matrix used for performing pca
    * @return PCA result
@@ -130,7 +130,7 @@ public class PCARunner<V extends NumberVector<? extends V, ?>> implements Parame
   }
 
   /**
-   * Process an existing eigenvalue decomposition
+   * Process an existing eigenvalue decomposition.
    * 
    * @param evd eigenvalue decomposition to use
    * @return PCA result
@@ -141,7 +141,7 @@ public class PCARunner<V extends NumberVector<? extends V, ?>> implements Parame
   }
 
   /**
-   * Get covariance matrix builder
+   * Get covariance matrix builder.
    * 
    * @return covariance matrix builder in use
    */
@@ -165,7 +165,7 @@ public class PCARunner<V extends NumberVector<? extends V, ?>> implements Parame
    * 
    * @apiviz.exclude
    */
-  public static class Parameterizer<V extends NumberVector<? extends V, ?>> extends AbstractParameterizer {
+  public static class Parameterizer<V extends NumberVector<?>> extends AbstractParameterizer {
     /**
      * The covariance computation class.
      */