Skip to content

Commit 7cff629

Browse files
committed
scalafmt: format 9 files to pass CI lint
1 parent c69594c commit 7cff629

File tree

9 files changed

+24
-17
lines changed

9 files changed

+24
-17
lines changed

src/main/scala/com/massivedatascience/clusterer/ml/AgglomerativeBregman.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,9 @@ class AgglomerativeBregmanModel(
478478
with Logging
479479
with HasTrainingSummary {
480480

481-
private[ml] var modelDivergence: String = "squaredEuclidean"
482-
private[ml] var modelSmoothing: Double = 1e-10
483-
private[ml] var modelLinkage: String = "average"
481+
private[ml] var modelDivergence: String = "squaredEuclidean"
482+
private[ml] var modelSmoothing: Double = 1e-10
483+
private[ml] var modelLinkage: String = "average"
484484
private[ml] var kernel: ClusteringKernel = _
485485

486486
/** Cluster centers as vectors for downstream consumers/tests. */

src/main/scala/com/massivedatascience/clusterer/ml/BalancedKMeans.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,6 @@ class BalancedKMeans(override val uid: String)
513513
withDistances.withColumn("_assignment", assignUdf(col("_row_id")))
514514
}
515515

516-
517516
override def transformSchema(schema: StructType): StructType = {
518517
require(
519518
schema.fieldNames.contains($(featuresCol)),

src/main/scala/com/massivedatascience/clusterer/ml/DPMeans.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ class DPMeans(override val uid: String)
365365
copyValues(model)
366366
}
367367

368-
369368
override def transformSchema(schema: StructType): StructType = {
370369
validateAndTransformSchema(schema)
371370
}
@@ -437,7 +436,6 @@ class DPMeansModel private[ml] (
437436
result
438437
}
439438

440-
441439
override def transformSchema(schema: StructType): StructType = {
442440
validateAndTransformSchema(schema)
443441
}

src/main/scala/com/massivedatascience/clusterer/ml/MiniBatchKMeans.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ class MiniBatchKMeans(override val uid: String)
336336
)
337337
}
338338

339-
340339
/** Initialize cluster centers. */
341340
private def initializeCenters(
342341
df: DataFrame,

src/main/scala/com/massivedatascience/clusterer/ml/RobustKMeans.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,8 @@ class RobustKMeansModel(
414414

415415
override def transform(dataset: Dataset[_]): DataFrame = {
416416
val df = dataset.toDF()
417-
val kernel = ClusteringOps.createKernel(divergenceName, $(smoothing)).asInstanceOf[BregmanKernel]
417+
val kernel =
418+
ClusteringOps.createKernel(divergenceName, $(smoothing)).asInstanceOf[BregmanKernel]
418419
val mode = OutlierMode.fromString(outlierModeName)
419420

420421
val bcKernel = df.sparkSession.sparkContext.broadcast(kernel)

src/main/scala/com/massivedatascience/clusterer/ml/SoftKMeans.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ class SoftKMeans(override val uid: String)
280280
}
281281
}
282282

283-
284283
/** Initialize cluster centers. */
285284
private def initializeCenters(
286285
df: DataFrame,

src/main/scala/com/massivedatascience/clusterer/ml/StreamingKMeans.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ class StreamingKMeansModel(
231231
// Mutable state for streaming updates (array contents are mutated, not references)
232232
@transient private val centerArrays: Array[Vector] = initialCenters.map(Vectors.dense)
233233
@transient private val clusterWeights: Array[Double] = Array.fill(initialCenters.length)(1.0)
234-
@transient private lazy val kernel: ClusteringKernel = createKernel(divergenceName, smoothingValue)
234+
@transient private lazy val kernel: ClusteringKernel =
235+
createKernel(divergenceName, smoothingValue)
235236

236237
/** Get current cluster centers as Vectors (defensive copy).
237238
*/

src/main/scala/com/massivedatascience/clusterer/ml/df/CenterInitializer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ private[ml] object CenterInitializer extends Logging {
7676
kernel: ClusteringKernel
7777
): Array[Array[Double]] = {
7878
initMode.toLowerCase match {
79-
case "random" => initializeRandom(df, featuresCol, k, seed)
79+
case "random" => initializeRandom(df, featuresCol, k, seed)
8080
case "k-means||" | "kmeansparallel" =>
8181
initializeKMeansPlusPlus(df, featuresCol, k, seed, kernel)
82-
case other =>
82+
case other =>
8383
throw new IllegalArgumentException(
8484
s"Unknown init mode: '$other'. Valid options: random, k-means||"
8585
)

src/test/scala/com/massivedatascience/clusterer/ml/df/BregmanKernelAccuracySuite.scala

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ class BregmanKernelAccuracySuite extends AnyFunSuite with Matchers {
911911
test("All kernels handle vectors with zeros (with smoothing)") {
912912
val testCases = Seq(
913913
(new SquaredEuclideanKernel(), Vectors.dense(0.0, 1.0, 0.0)),
914-
(new KLDivergenceKernel(1e-6), Vectors.dense(0.0, 1.0)), // Needs smoothing
914+
(new KLDivergenceKernel(1e-6), Vectors.dense(0.0, 1.0)), // Needs smoothing
915915
(new GeneralizedIDivergenceKernel(1e-6), Vectors.dense(0.0, 1.0)) // Needs smoothing
916916
)
917917

@@ -1030,8 +1030,17 @@ class BregmanKernelAccuracySuite extends AnyFunSuite with Matchers {
10301030
}
10311031

10321032
test("ClusteringOps: createUpdateStrategy returns GradMeanUDAFUpdate for Bregman kernels") {
1033-
for (div <- Seq("squaredEuclidean", "kl", "itakuraSaito", "generalizedI", "logistic",
1034-
"spherical", "cosine")) {
1033+
for (
1034+
div <- Seq(
1035+
"squaredEuclidean",
1036+
"kl",
1037+
"itakuraSaito",
1038+
"generalizedI",
1039+
"logistic",
1040+
"spherical",
1041+
"cosine"
1042+
)
1043+
) {
10351044
withClue(s"divergence=$div:") {
10361045
val updater = ClusteringOps.createUpdateStrategy(div)
10371046
updater shouldBe a[strategies.GradMeanUDAFUpdate]
@@ -1046,8 +1055,9 @@ class BregmanKernelAccuracySuite extends AnyFunSuite with Matchers {
10461055
}
10471056

10481057
test("ClusteringOps: createKernel returns BregmanKernel for standard divergences") {
1049-
for (div <- Seq("squaredEuclidean", "kl", "itakuraSaito", "generalizedI", "logistic",
1050-
"spherical")) {
1058+
for (
1059+
div <- Seq("squaredEuclidean", "kl", "itakuraSaito", "generalizedI", "logistic", "spherical")
1060+
) {
10511061
withClue(s"divergence=$div:") {
10521062
val kernel = ClusteringOps.createKernel(div)
10531063
kernel shouldBe a[kernels.BregmanKernel]

0 commit comments

Comments
 (0)