Add fowlkess-mallows and calinski scores to metrics.scorers

raghavrv · raghavrv · commit 281197d456eb · 2016-12-26T21:46:42.000+01:00
diff --git a/sklearn/metrics/scorer.py b/sklearn/metrics/scorer.py
@@ -26,7 +26,8 @@
 from . import (r2_score, median_absolute_error, mean_absolute_error,
                mean_squared_error, mean_squared_log_error, accuracy_score,
                f1_score, roc_auc_score, average_precision_score,
-               precision_score, recall_score, log_loss)
+               precision_score, recall_score, log_loss,
+               fowlkes_mallows_score, calinski_harabaz_score)
 from .cluster import adjusted_rand_score
 from ..utils.multiclass import type_of_target
 from ..externals import six
@@ -406,7 +407,9 @@ def make_scorer(score_func, greater_is_better=True, needs_proba=False,
                average_precision=average_precision_scorer,
                log_loss=log_loss_scorer,
                neg_log_loss=neg_log_loss_scorer,
-               adjusted_rand_score=adjusted_rand_scorer)
+               adjusted_rand_score=adjusted_rand_scorer,
+               fowlkes_mallows_score=fowlkes_mallows_score,
+               calinski_harabaz_score=calinski_harabaz_score)
 
 for name, metric in [('precision', precision_score),
                      ('recall', recall_score), ('f1', f1_score)]:
