Skip to content

Commit c6e764a

Browse files
committed
Fix deprecated implicit parameters without using from Scala 3.7.0
1 parent d9b0b37 commit c6e764a

File tree

9 files changed

+19
-17
lines changed

9 files changed

+19
-17
lines changed

src/main/scala/eu/sim642/adventofcode2017/Day2.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ object Day2 {
1919

2020
object Part2 extends Part {
2121
override def rowChecksum(row: Seq[Int]): Int = {
22-
val descRow = row.sorted(Ordering[Int].reverse)
22+
val descRow = row.sorted(using Ordering[Int].reverse)
2323
val dividePairs = for {
2424
i <- descRow.indices
2525
j <- (i + 1) until descRow.size

src/main/scala/eu/sim642/adventofcode2018/Day23.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ object Day23 {
143143

144144
def closestMostNanobots(nanobots: Seq[Nanobot]): Int = {
145145
val queue: mutable.PriorityQueue[(Nanobot, (Int, Int), Int)] =
146-
mutable.PriorityQueue.empty(Ordering.by({ case (octahedron, (lower, upper), originDist) =>
146+
mutable.PriorityQueue.empty(using Ordering.by({ case (octahedron, (lower, upper), originDist) =>
147147
(upper, lower, -originDist)
148148
//(upper, -octahedron.radius, -originDist) // much faster but possibly incorrect?
149149
}))
@@ -241,7 +241,7 @@ object Day23 {
241241

242242
def closestMostNanobots(nanobots: Seq[Nanobot]): Int = {
243243
val queue: mutable.PriorityQueue[(Box3, (Int, Int), Int)] =
244-
mutable.PriorityQueue.empty(Ordering.by({ case (octahedron, (lower, upper), originDist) =>
244+
mutable.PriorityQueue.empty(using Ordering.by({ case (octahedron, (lower, upper), originDist) =>
245245
(upper, lower, -originDist)
246246
//(upper, -octahedron.radius, -originDist) // much faster but possibly incorrect?
247247
}))

src/main/scala/eu/sim642/adventofcode2019/Day10.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ object Day10 {
6565
Seq.empty
6666
else {
6767
val visible = filterVisible(monitoring, asteroids)
68-
val vaporizeRotation = visible.toSeq.sortBy(laserAngle(monitoring, _))(Ordering.Double.TotalOrdering)
68+
val vaporizeRotation = visible.toSeq.sortBy(laserAngle(monitoring, _))(using Ordering.Double.TotalOrdering)
6969
vaporizeRotation ++ vaporizeSeq(monitoring, asteroids -- visible)
7070
}
7171
}

src/main/scala/eu/sim642/adventofcode2023/Day7.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ object Day7 {
1717
case HighCard
1818
}
1919

20-
val handTypeOrdering: Ordering[HandType] = Ordering.by[HandType, Int](_.ordinal)(Ordering[Int]).reverse
20+
val handTypeOrdering: Ordering[HandType] = Ordering.by[HandType, Int](_.ordinal)(using Ordering[Int]).reverse
2121

2222
def handFrequency(hand: Hand): Seq[Int] =
23-
hand.groupCount(identity).values.toSeq.sorted(Ordering[Int].reverse)
23+
hand.groupCount(identity).values.toSeq.sorted(using Ordering[Int].reverse)
2424

2525
def frequencyHandType(freq: Seq[Int]): HandType = freq match {
2626
case Seq(5) => HandType.FiveOfAKind
@@ -40,11 +40,11 @@ object Day7 {
4040

4141
def handType(hand: Hand): HandType
4242

43-
val handOrdering: Ordering[Hand] = Ordering.by(handType)(handTypeOrdering).orElse(Ordering.Implicits.seqOrdering(cardOrdering))
43+
val handOrdering: Ordering[Hand] = Ordering.by(handType)(using handTypeOrdering).orElse(Ordering.Implicits.seqOrdering(using cardOrdering))
4444

4545
def totalWinnings(hands: Seq[(Hand, Int)]): Int = {
4646
hands
47-
.sortBy(_._1)(handOrdering)
47+
.sortBy(_._1)(using handOrdering)
4848
.zipWithIndex
4949
.map({ case ((hand, bid), i) => (i + 1) * bid })
5050
.sum

src/main/scala/eu/sim642/adventofcode2024/Day21.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,10 @@ object Day21 {
8787
override val startNode: State =
8888
State(List.fill(directionalKeypads)(directionalKeypad.posOf('A')), numericKeypad.posOf('A'), "")
8989

90-
override def unitNeighbors(state: State): IterableOnce[State] =
91-
"<v>^A".iterator.flatten(state.userPress).filter(newState => code.startsWith(newState.input))
90+
override def unitNeighbors(state: State): IterableOnce[State] = {
91+
// TODO: why not flatMap?
92+
"<v>^A".iterator.flatten(using state.userPress).filter(newState => code.startsWith(newState.input))
93+
}
9294

9395
override def isTargetNode(state: State, dist: Int): Boolean = state.input == code
9496
}

src/main/scala/eu/sim642/adventofcodelib/NumberTheory.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ object NumberTheory {
7070
}
7171

7272
def sieveCrt[A](ans: Seq[(A, A)])(using aIntegral: Integral[A]): (A, A) = {
73-
ans.sortBy(_._2)(aIntegral.reverse)
73+
ans.sortBy(_._2)(using aIntegral.reverse)
7474
.reduceLeft(sieveCrt2(_, _))
7575
}
7676
}

src/main/scala/eu/sim642/adventofcodelib/graph/AStar.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object AStar {
66
// moved from 2018 Day 22
77
def search[A](graphSearch: GraphSearch[A] & Heuristic[A]): Distances[A] & Target[A] = {
88
val visitedDistance: mutable.Map[A, Int] = mutable.Map.empty
9-
val toVisit: mutable.PriorityQueue[(Int, Int, A)] = mutable.PriorityQueue.empty(Ordering.by(-_._1))
9+
val toVisit: mutable.PriorityQueue[(Int, Int, A)] = mutable.PriorityQueue.empty(using Ordering.by(-_._1))
1010

1111
def enqueueHeuristically(node: A, dist: Int): Unit = {
1212
toVisit.enqueue((dist + graphSearch.heuristic(node), dist, node))

src/main/scala/eu/sim642/adventofcodelib/graph/Dijkstra.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object Dijkstra {
88
// copied from AStar
99
def traverse[A](graphTraversal: GraphTraversal[A]): Distances[A] = {
1010
val visitedDistance: mutable.Map[A, Int] = mutable.Map.empty
11-
val toVisit: mutable.PriorityQueue[(Int, A)] = mutable.PriorityQueue.empty(Ordering.by(-_._1))
11+
val toVisit: mutable.PriorityQueue[(Int, A)] = mutable.PriorityQueue.empty(using Ordering.by(-_._1))
1212

1313
def enqueue(node: A, dist: Int): Unit = {
1414
toVisit.enqueue((dist, node))
@@ -40,7 +40,7 @@ object Dijkstra {
4040
// copied from AStar
4141
def search[A](graphSearch: GraphSearch[A]): Distances[A] & Target[A] = {
4242
val visitedDistance: mutable.Map[A, Int] = mutable.Map.empty
43-
val toVisit: mutable.PriorityQueue[(Int, A)] = mutable.PriorityQueue.empty(Ordering.by(-_._1))
43+
val toVisit: mutable.PriorityQueue[(Int, A)] = mutable.PriorityQueue.empty(using Ordering.by(-_._1))
4444

4545
def enqueue(node: A, dist: Int): Unit = {
4646
toVisit.enqueue((dist, node))

src/main/scala/eu/sim642/adventofcodelib/graph/NaiveTSP.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ object NaiveTSP {
1919
.permutations
2020
.map({ path =>
2121
totalPathLength(distanceMatrix, path)
22-
}).min(lengthOrdering)
22+
}).min(using lengthOrdering)
2323
}
2424

2525
// moved from 2016 Day 24
@@ -29,7 +29,7 @@ object NaiveTSP {
2929
.map({ path =>
3030
distanceMatrix(start)(path.head) +
3131
totalPathLength(distanceMatrix, path)
32-
}).min(lengthOrdering)
32+
}).min(using lengthOrdering)
3333
}
3434

3535
// moved from 2016 Day 24
@@ -40,7 +40,7 @@ object NaiveTSP {
4040
distanceMatrix(start)(path.head) +
4141
totalPathLength(distanceMatrix, path) +
4242
distanceMatrix(path.last)(start)
43-
}).min(lengthOrdering)
43+
}).min(using lengthOrdering)
4444
}
4545

4646
def cycleLength[A](distanceMatrix: DistanceMatrix[A])(using lengthOrdering: Ordering[Int]): Int = {

0 commit comments

Comments
 (0)