← 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/clustering/OPTICS.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:
src/de/lmu/ifi/dbs/elki/algorithm/clustering/OPTICS.java
33
33
import de.lmu.ifi.dbs.elki.database.ids.DBIDUtil;
34
34
import de.lmu.ifi.dbs.elki.database.ids.ModifiableDBIDs;
35
35
import de.lmu.ifi.dbs.elki.database.ids.distance.DistanceDBIDList;
 
36
import de.lmu.ifi.dbs.elki.database.ids.distance.DistanceDBIDListIter;
36
37
import de.lmu.ifi.dbs.elki.database.ids.distance.DistanceDBIDPair;
37
 
import de.lmu.ifi.dbs.elki.database.ids.distance.DistanceDBIDListIter;
 
38
import de.lmu.ifi.dbs.elki.database.ids.distance.DoubleDistanceDBIDListIter;
38
39
import de.lmu.ifi.dbs.elki.database.ids.distance.DoubleDistanceDBIDPair;
39
 
import de.lmu.ifi.dbs.elki.database.ids.distance.DoubleDistanceDBIDListIter;
40
40
import de.lmu.ifi.dbs.elki.database.query.range.RangeQuery;
41
41
import de.lmu.ifi.dbs.elki.database.relation.Relation;
42
42
import de.lmu.ifi.dbs.elki.distance.DistanceUtil;
55
55
import de.lmu.ifi.dbs.elki.utilities.documentation.Reference;
56
56
import de.lmu.ifi.dbs.elki.utilities.documentation.Title;
57
57
import de.lmu.ifi.dbs.elki.utilities.optionhandling.OptionID;
58
 
import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.GreaterConstraint;
 
58
import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.CommonConstraints;
59
59
import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameterization;
60
60
import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.DistanceParameter;
61
61
import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter;
146
146
      // boxing/unboxing.
147
147
      for(DBIDIter iditer = relation.iterDBIDs(); iditer.valid(); iditer.advance()) {
148
148
        if(!processedIDs.contains(iditer)) {
149
 
          // We need to do some ugly casts to be able to run the optimized version, unfortunately.
 
149
          // We need to do some ugly casts to be able to run the optimized
 
150
          // version, unfortunately.
150
151
          @SuppressWarnings("unchecked")
151
152
          final ClusterOrderResult<DoubleDistance> doubleClusterOrder = ClusterOrderResult.class.cast(clusterOrder);
152
153
          @SuppressWarnings("unchecked")
304
305
      }
305
306
 
306
307
      IntParameter minptsP = new IntParameter(MINPTS_ID);
307
 
      minptsP.addConstraint(new GreaterConstraint(0));
 
308
      minptsP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
308
309
      if(config.grab(minptsP)) {
309
310
        minpts = minptsP.intValue();
310
311
      }