← Back to branch summary

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

« back to all changes in this revision

Viewing changes to test/de/lmu/ifi/dbs/elki/index/preprocessed/TestMaterializedKNNAndRKNNPreprocessor.java

  • Committer: Package Import Robot
  • Author(s): Erich Schubert
  • Date: 2014-01-22 16:23:20 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20140122162320-dtqtgcdiki8t9unc
Tags: 0.6.0-1
* New upstream final.
* 3DPC extension is not included, but may be uploaded as a separate
  package when there is actual need (it is a demo software, not meant
  for use outside of research, so just get the source code!)
* Upgrade to policy 3.9.5.0 (no changes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/de/lmu/ifi/dbs/elki/index/preprocessed/TestMaterializedKNNAndRKNNPreprocessor.java
47
47
import de.lmu.ifi.dbs.elki.database.ids.distance.KNNList;
48
48
import de.lmu.ifi.dbs.elki.database.query.distance.DistanceQuery;
49
49
import de.lmu.ifi.dbs.elki.database.query.knn.KNNQuery;
50
 
import de.lmu.ifi.dbs.elki.database.query.knn.LinearScanKNNQuery;
 
50
import de.lmu.ifi.dbs.elki.database.query.knn.LinearScanDistanceKNNQuery;
51
51
import de.lmu.ifi.dbs.elki.database.query.rknn.LinearScanRKNNQuery;
52
52
import de.lmu.ifi.dbs.elki.database.query.rknn.RKNNQuery;
53
53
import de.lmu.ifi.dbs.elki.database.relation.Relation;
98
98
  @Test
99
99
  public void testPreprocessor() throws ParameterException, UnableToComplyException {
100
100
    ListParameterization params = new ListParameterization();
101
 
    params.addParameter(FileBasedDatabaseConnection.INPUT_ID, dataset);
 
101
    params.addParameter(FileBasedDatabaseConnection.Parameterizer.INPUT_ID, dataset);
102
102
 
103
103
    // get database
104
104
    UpdatableDatabase db = ClassGenericsUtil.parameterizeOrAbort(HashmapDatabase.class, params);
110
110
    assertEquals("Data set size doesn't match parameters.", shoulds, rep.size());
111
111
 
112
112
    // get linear queries
113
 
    LinearScanKNNQuery<DoubleVector, DoubleDistance> lin_knn_query = new LinearScanKNNQuery<>(distanceQuery);
 
113
    LinearScanDistanceKNNQuery<DoubleVector, DoubleDistance> lin_knn_query = new LinearScanDistanceKNNQuery<>(distanceQuery);
114
114
    LinearScanRKNNQuery<DoubleVector, DoubleDistance> lin_rknn_query = new LinearScanRKNNQuery<>(distanceQuery, lin_knn_query, k);
115
115
 
116
116
    // get preprocessed queries
122
122
    RKNNQuery<DoubleVector, DoubleDistance> preproc_rknn_query = preproc.getRKNNQuery(distanceQuery);
123
123
    // add as index
124
124
    db.addIndex(preproc);
125
 
    assertTrue("Preprocessor knn query class incorrect.", !(preproc_knn_query instanceof LinearScanKNNQuery));
126
 
    assertTrue("Preprocessor rknn query class incorrect.", !(preproc_rknn_query instanceof LinearScanKNNQuery));
 
125
    assertTrue("Preprocessor knn query class incorrect.", !(preproc_knn_query instanceof LinearScanDistanceKNNQuery));
 
126
    assertTrue("Preprocessor rknn query class incorrect.", !(preproc_rknn_query instanceof LinearScanDistanceKNNQuery));
127
127
 
128
128
    // test queries
129
129
    testKNNQueries(rep, lin_knn_query, preproc_knn_query, k);