1 files changed, 7 insertions, 12 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/math/linearalgebra/pca/CovarianceMatrixBuilder.java b/src/de/lmu/ifi/dbs/elki/math/linearalgebra/pca/CovarianceMatrixBuilder.java
index d819c839..7bcf487d 100644
--- a/src/de/lmu/ifi/dbs/elki/math/linearalgebra/pca/CovarianceMatrixBuilder.java
+++ b/src/de/lmu/ifi/dbs/elki/math/linearalgebra/pca/CovarianceMatrixBuilder.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.math.linearalgebra.pca;
  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
@@ -25,26 +25,23 @@ package de.lmu.ifi.dbs.elki.math.linearalgebra.pca;
 
 import de.lmu.ifi.dbs.elki.data.NumberVector;
 import de.lmu.ifi.dbs.elki.database.ids.DBIDs;
-import de.lmu.ifi.dbs.elki.database.ids.distance.DistanceDBIDList;
+import de.lmu.ifi.dbs.elki.database.ids.DoubleDBIDList;
 import de.lmu.ifi.dbs.elki.database.relation.Relation;
-import de.lmu.ifi.dbs.elki.distance.distancevalue.NumberDistance;
 import de.lmu.ifi.dbs.elki.math.linearalgebra.Matrix;
 
 /**
  * Interface for computing covariance matrixes on a data set.
  * 
  * @author Erich Schubert
- *
- * @param <V> Vector base type
  */
-public interface CovarianceMatrixBuilder<V extends NumberVector<?>> {
+public interface CovarianceMatrixBuilder {
   /**
    * Compute Covariance Matrix for a complete database.
    * 
    * @param database the database used
    * @return Covariance Matrix
    */
-  Matrix processDatabase(Relation<? extends V> database);
+  Matrix processDatabase(Relation<? extends NumberVector> database);
 
   /**
    * Compute Covariance Matrix for a collection of database IDs.
@@ -53,7 +50,7 @@ public interface CovarianceMatrixBuilder<V extends NumberVector<?>> {
    * @param database the database used
    * @return Covariance Matrix
    */
-  Matrix processIds(DBIDs ids, Relation<? extends V> database);
+  Matrix processIds(DBIDs ids, Relation<? extends NumberVector> database);
 
   /**
    * Compute Covariance Matrix for a QueryResult Collection.
@@ -63,10 +60,9 @@ public interface CovarianceMatrixBuilder<V extends NumberVector<?>> {
    * @param results a collection of QueryResults
    * @param database the database used
    * @param k the number of entries to process
-   * @param <D> distance type
    * @return Covariance Matrix
    */
-  <D extends NumberDistance<D, ?>> Matrix processQueryResults(DistanceDBIDList<D> results, Relation<? extends V> database, int k);
+  Matrix processQueryResults(DoubleDBIDList results, Relation<? extends NumberVector> database, int k);
 
   /**
    * Compute Covariance Matrix for a QueryResult Collection.
@@ -75,8 +71,7 @@ public interface CovarianceMatrixBuilder<V extends NumberVector<?>> {
    * 
    * @param results a collection of QueryResults
    * @param database the database used
-   * @param <D> distance type
    * @return Covariance Matrix
    */
-  <D extends NumberDistance<D, ?>> Matrix processQueryResults(DistanceDBIDList<D> results, Relation<? extends V> database);
+  Matrix processQueryResults(DoubleDBIDList results, Relation<? extends NumberVector> database);
 }
 \ No newline at end of file