← Back to branch summary

~ubuntu-branches/ubuntu/vivid/elki/vivid

« back to all changes in this revision

Viewing changes to src/de/lmu/ifi/dbs/elki/distance/similarityfunction/kernel/KernelMatrix.java

  • Committer: Package Import Robot
  • Author(s): Erich Schubert
  • Date: 2012-12-14 20:45:15 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20121214204515-4m0d0er9ivtu5w9d
Tags: 0.5.5-1
New upstream release: 0.5.5 interim release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/de/lmu/ifi/dbs/elki/distance/similarityfunction/kernel/KernelMatrix.java
69
69
   * @deprecated ID mapping is not reliable!
70
70
   */
71
71
  @Deprecated
72
 
  public <O extends FeatureVector<O, ?>> KernelMatrix(final PrimitiveSimilarityFunction<? super O, DoubleDistance> kernelFunction, final Relation<? extends O> database) {
 
72
  public <O extends FeatureVector<?>> KernelMatrix(final PrimitiveSimilarityFunction<? super O, DoubleDistance> kernelFunction, final Relation<? extends O> database) {
73
73
    this(kernelFunction, database, DBIDUtil.ensureArray(database.getDBIDs()));
74
74
  }
75
75
 
80
80
   * @param database the database that holds the objects
81
81
   * @param ids the IDs of those objects for which the kernel matrix is computed
82
82
   */
83
 
  public <O extends FeatureVector<O, ?>> KernelMatrix(final PrimitiveSimilarityFunction<? super O, DoubleDistance> kernelFunction, final Relation<? extends O> database, final ArrayDBIDs ids) {
 
83
  public <O extends FeatureVector<?>> KernelMatrix(final PrimitiveSimilarityFunction<? super O, DoubleDistance> kernelFunction, final Relation<? extends O> database, final ArrayDBIDs ids) {
84
84
    LoggingUtil.logExpensive(Level.FINER, "Computing kernel matrix");
85
85
    kernel = new Matrix(ids.size(), ids.size());
86
86
    double value;