← 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/correlation/COPAC.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/correlation/COPAC.java
29
29
import java.util.Map.Entry;
30
30
 
31
31
import de.lmu.ifi.dbs.elki.algorithm.AbstractAlgorithm;
32
 
import de.lmu.ifi.dbs.elki.algorithm.AbstractDistanceBasedAlgorithm;
 
32
import de.lmu.ifi.dbs.elki.algorithm.DistanceBasedAlgorithm;
33
33
import de.lmu.ifi.dbs.elki.algorithm.clustering.ClusteringAlgorithm;
34
34
import de.lmu.ifi.dbs.elki.data.Cluster;
35
35
import de.lmu.ifi.dbs.elki.data.Clustering;
270
270
  public ClusteringAlgorithm<Clustering<Model>> getPartitionAlgorithm(DistanceQuery<V, D> query) {
271
271
    ListParameterization reconfig = new ListParameterization(partitionAlgorithmParameters);
272
272
    ProxyDistanceFunction<V, D> dist = ProxyDistanceFunction.proxy(query);
273
 
    reconfig.addParameter(AbstractDistanceBasedAlgorithm.DISTANCE_FUNCTION_ID, dist);
 
273
    reconfig.addParameter(DistanceBasedAlgorithm.DISTANCE_FUNCTION_ID, dist);
274
274
    ClusteringAlgorithm<Clustering<Model>> instance = reconfig.tryInstantiate(partitionAlgorithm);
275
275
    reconfig.failOnErrors();
276
276
    return instance;
335
335
      ClassParameter<ClusteringAlgorithm<Clustering<Model>>> algP = new ClassParameter<>(PARTITION_ALGORITHM_ID, ClusteringAlgorithm.class);
336
336
      if(config.grab(algP)) {
337
337
        ListParameterization predefined = new ListParameterization();
338
 
        predefined.addParameter(AbstractDistanceBasedAlgorithm.DISTANCE_FUNCTION_ID, pdistI);
 
338
        predefined.addParameter(DistanceBasedAlgorithm.DISTANCE_FUNCTION_ID, pdistI);
339
339
        TrackParameters trackpar = new TrackParameters(config);
340
340
        ChainedParameterization chain = new ChainedParameterization(predefined, trackpar);
341
341
        chain.errorsTo(config);