1 files changed, 5 insertions, 23 deletions

diff --git a/test/de/lmu/ifi/dbs/elki/algorithm/AbstractSimpleAlgorithmTest.java b/test/de/lmu/ifi/dbs/elki/algorithm/AbstractSimpleAlgorithmTest.java
index 894a314f..7b6fbbfa 100644
--- a/test/de/lmu/ifi/dbs/elki/algorithm/AbstractSimpleAlgorithmTest.java
+++ b/test/de/lmu/ifi/dbs/elki/algorithm/AbstractSimpleAlgorithmTest.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.algorithm;
  This file is part of ELKI:
  Environment for Developing KDD-Applications Supported by Index-Structures
 
- Copyright (C) 2011
+ Copyright (C) 2012
  Ludwig-Maximilians-Universität München
  Lehr- und Forschungseinheit für Datenbanksysteme
  ELKI Development Team
@@ -34,7 +34,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import de.lmu.ifi.dbs.elki.algorithm.clustering.trivial.ByLabelClustering;
-import de.lmu.ifi.dbs.elki.algorithm.clustering.trivial.ByLabelHierarchicalClustering;
 import de.lmu.ifi.dbs.elki.data.Cluster;
 import de.lmu.ifi.dbs.elki.data.Clustering;
 import de.lmu.ifi.dbs.elki.data.model.Model;
@@ -46,7 +45,7 @@ import de.lmu.ifi.dbs.elki.database.ids.DBIDUtil;
 import de.lmu.ifi.dbs.elki.database.relation.Relation;
 import de.lmu.ifi.dbs.elki.datasource.FileBasedDatabaseConnection;
 import de.lmu.ifi.dbs.elki.datasource.filter.FixedDBIDsFilter;
-import de.lmu.ifi.dbs.elki.evaluation.paircounting.PairCountingFMeasure;
+import de.lmu.ifi.dbs.elki.evaluation.clustering.ClusterContingencyTable;
 import de.lmu.ifi.dbs.elki.evaluation.roc.ComputeROCCurve;
 import de.lmu.ifi.dbs.elki.logging.Logging;
 import de.lmu.ifi.dbs.elki.result.Result;
@@ -155,26 +154,9 @@ public abstract class AbstractSimpleAlgorithmTest {
     ByLabelClustering bylabel = new ByLabelClustering();
     Clustering<Model> rbl = bylabel.run(database);
 
-    double score = PairCountingFMeasure.compareClusterings(clustering, rbl, 1.0);
-    if(logger.isVerbose()) {
-      logger.verbose(this.getClass().getSimpleName() + " score: " + score + " expect: " + expected);
-    }
-    org.junit.Assert.assertEquals(this.getClass().getSimpleName() + ": Score does not match.", expected, score, 0.0001);
-  }
-
-  /**
-   * Test the clustering result by comparing the score with an expected value.
-   * 
-   * @param database Database to test
-   * @param clustering Clustering result
-   * @param expected Expected score
-   */
-  protected <O> void testFMeasureHierarchical(Database database, Clustering<?> clustering, double expected) {
-    // Run by-label as reference
-    ByLabelHierarchicalClustering bylabel = new ByLabelHierarchicalClustering();
-    Clustering<Model> rbl = bylabel.run(database);
-
-    double score = PairCountingFMeasure.compareClusterings(clustering, rbl, 1.0, false, true);
+    ClusterContingencyTable ct = new ClusterContingencyTable(true, false);
+    ct.process(clustering, rbl);
+    double score = ct.getPaircount().f1Measure();
     if(logger.isVerbose()) {
       logger.verbose(this.getClass().getSimpleName() + " score: " + score + " expect: " + expected);
     }