Skip to content

Commit c2bf2b1

Browse files
author
Andrew Bullen
committed
[SPARK-4256] Update Code formatting for BinaryClassificationMetricsSpec
1 parent 36b0533 commit c2bf2b1

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

mllib/src/test/scala/org/apache/spark/mllib/evaluation/BinaryClassificationMetricsSuite.scala

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,36 @@ class BinaryClassificationMetricsSuite extends FunSuite with LocalSparkContext {
3030
(x._1._1 ~= x._2._1 absTol 1E-5) && (x._1._2 ~= x._2._2 absTol 1E-5)
3131

3232
private def assertSequencesMatch(left: Seq[Double], right: Seq[Double]): Unit = {
33-
assert(left.zip(right).forall(areWithinEpsilon))
33+
assert(left.zip(right).forall(areWithinEpsilon))
3434
}
3535

36-
private def assertTupleSequencesMatch(left: Seq[(Double, Double)], right: Seq[(Double, Double)]): Unit = {
36+
private def assertTupleSequencesMatch(left: Seq[(Double, Double)],
37+
right: Seq[(Double, Double)]): Unit = {
3738
assert(left.zip(right).forall(pairsWithinEpsilon))
3839
}
3940

4041
private def validateMetrics(metrics: BinaryClassificationMetrics,
41-
expectedThresholds: Seq[Double],
42-
expectedROCCurve: Seq[(Double, Double)],
43-
expectedPRCurve: Seq[(Double, Double)],
44-
expectedFMeasures1: Seq[Double],
45-
expectedFmeasures2: Seq[Double],
46-
expectedPrecisions: Seq[Double],
47-
expectedRecalls: Seq[Double]) = {
42+
expectedThresholds: Seq[Double],
43+
expectedROCCurve: Seq[(Double, Double)],
44+
expectedPRCurve: Seq[(Double, Double)],
45+
expectedFMeasures1: Seq[Double],
46+
expectedFmeasures2: Seq[Double],
47+
expectedPrecisions: Seq[Double],
48+
expectedRecalls: Seq[Double]) = {
4849

4950
assertSequencesMatch(metrics.thresholds().collect(), expectedThresholds)
5051
assertTupleSequencesMatch(metrics.roc().collect(), expectedROCCurve)
5152
assert(metrics.areaUnderROC() ~== AreaUnderCurve.of(expectedROCCurve) absTol 1E-5)
5253
assertTupleSequencesMatch(metrics.pr().collect(), expectedPRCurve)
5354
assert(metrics.areaUnderPR() ~== AreaUnderCurve.of(expectedPRCurve) absTol 1E-5)
54-
assertTupleSequencesMatch(metrics.fMeasureByThreshold().collect(), expectedThresholds.zip(expectedFMeasures1))
55-
assertTupleSequencesMatch(metrics.fMeasureByThreshold(2.0).collect(), expectedThresholds.zip(expectedFmeasures2))
56-
assertTupleSequencesMatch(metrics.precisionByThreshold().collect(), expectedThresholds.zip(expectedPrecisions))
57-
assertTupleSequencesMatch(metrics.recallByThreshold().collect(), expectedThresholds.zip(expectedRecalls))
55+
assertTupleSequencesMatch(metrics.fMeasureByThreshold().collect(),
56+
expectedThresholds.zip(expectedFMeasures1))
57+
assertTupleSequencesMatch(metrics.fMeasureByThreshold(2.0).collect(),
58+
expectedThresholds.zip(expectedFmeasures2))
59+
assertTupleSequencesMatch(metrics.precisionByThreshold().collect(),
60+
expectedThresholds.zip(expectedPrecisions))
61+
assertTupleSequencesMatch(metrics.recallByThreshold().collect(),
62+
expectedThresholds.zip(expectedRecalls))
5863
}
5964

6065
test("binary evaluation metrics") {
@@ -80,9 +85,9 @@ class BinaryClassificationMetricsSuite extends FunSuite with LocalSparkContext {
8085
validateMetrics(metrics, thresholds, rocCurve, prCurve, f1, f2, precisions, recalls)
8186
}
8287

83-
test("binary evaluation metrics for All Positive RDD") {
88+
test("binary evaluation metrics for RDD where all examples have positive label") {
8489
val scoreAndLabels = sc.parallelize(Seq((0.5, 1.0), (0.5, 1.0)), 2)
85-
val metrics: BinaryClassificationMetrics = new BinaryClassificationMetrics(scoreAndLabels)
90+
val metrics = new BinaryClassificationMetrics(scoreAndLabels)
8691

8792
val thresholds = Seq(0.5)
8893
val precisions = Seq(1.0)
@@ -97,9 +102,9 @@ class BinaryClassificationMetricsSuite extends FunSuite with LocalSparkContext {
97102
validateMetrics(metrics, thresholds, rocCurve, prCurve, f1, f2, precisions, recalls)
98103
}
99104

100-
test("binary evaluation metrics for All Negative RDD") {
105+
test("binary evaluation metrics for RDD where all examples have negative label") {
101106
val scoreAndLabels = sc.parallelize(Seq((0.5, 0.0), (0.5, 0.0)), 2)
102-
val metrics: BinaryClassificationMetrics = new BinaryClassificationMetrics(scoreAndLabels)
107+
val metrics = new BinaryClassificationMetrics(scoreAndLabels)
103108

104109
val thresholds = Seq(0.5)
105110
val precisions = Seq(0.0)

0 commit comments

Comments
 (0)