← 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/algorithm/outlier/spatial/neighborhood/weighted/UnweightedNeighborhoodAdapter.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/algorithm/outlier/spatial/neighborhood/weighted/UnweightedNeighborhoodAdapter.java
28
28
 
29
29
import de.lmu.ifi.dbs.elki.algorithm.outlier.spatial.neighborhood.NeighborSetPredicate;
30
30
import de.lmu.ifi.dbs.elki.data.type.TypeInformation;
31
 
import de.lmu.ifi.dbs.elki.database.ids.DBID;
32
31
import de.lmu.ifi.dbs.elki.database.ids.DBIDIter;
 
32
import de.lmu.ifi.dbs.elki.database.ids.DBIDRef;
 
33
import de.lmu.ifi.dbs.elki.database.ids.DBIDUtil;
33
34
import de.lmu.ifi.dbs.elki.database.ids.DBIDs;
 
35
import de.lmu.ifi.dbs.elki.database.ids.DoubleDBIDPair;
34
36
import de.lmu.ifi.dbs.elki.database.relation.Relation;
35
37
import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer;
36
38
import de.lmu.ifi.dbs.elki.utilities.optionhandling.OptionID;
37
39
import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameterization;
38
40
import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter;
39
 
import de.lmu.ifi.dbs.elki.utilities.pairs.DoubleObjPair;
40
41
 
41
42
/**
42
43
 * Adapter to use unweighted neighborhoods in an algorithm that requires
61
62
  }
62
63
 
63
64
  @Override
64
 
  public Collection<DoubleObjPair<DBID>> getWeightedNeighbors(DBID reference) {
 
65
  public Collection<DoubleDBIDPair> getWeightedNeighbors(DBIDRef reference) {
65
66
    DBIDs neighbors = inner.getNeighborDBIDs(reference);
66
 
    ArrayList<DoubleObjPair<DBID>> adapted = new ArrayList<DoubleObjPair<DBID>>(neighbors.size());
 
67
    ArrayList<DoubleDBIDPair> adapted = new ArrayList<DoubleDBIDPair>(neighbors.size());
67
68
    for(DBIDIter iter = neighbors.iter(); iter.valid(); iter.advance()) {
68
 
      DBID id = iter.getDBID();
69
 
      adapted.add(new DoubleObjPair<DBID>(1.0, id));
 
69
      adapted.add(DBIDUtil.newPair(1.0, iter));
70
70
    }
71
71
    return adapted;
72
72
  }
120
120
      /**
121
121
       * The parameter to give the non-weighted neighborhood to use.
122
122
       */
123
 
      public static final OptionID INNER_ID = OptionID.getOrCreateOptionID("neighborhood.inner", "Parameter for the non-weighted neighborhood to use.");
 
123
      public static final OptionID INNER_ID = new OptionID("neighborhood.inner", "Parameter for the non-weighted neighborhood to use.");
124
124
 
125
125
      /**
126
126
       * The actual predicate.