Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add last, sortBy and sorted to NonEmptyList #1578

Merged
merged 4 commits into from
Mar 31, 2017
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions core/src/main/scala/cats/data/NonEmptyList.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ final case class NonEmptyList[+A](head: A, tail: List[A]) {
*/
def toList: List[A] = head :: tail

def last: A = tail.lastOption match {
case None => head
case Some(a) => a
}

/**
* Applies f to all the elements of the structure
*/
Expand Down Expand Up @@ -218,6 +223,40 @@ final case class NonEmptyList[+A](head: A, tail: List[A]) {
NonEmptyList((head, 0), bldr.result)
}

/**
* Sorts this `NonEmptyList` according to an `Order` on transformed `B` from `A`
*
* {{{
* scala> import cats.data.NonEmptyList
* scala> import cats.instances.int._
* scala> val nel = NonEmptyList.of(('a', 4), ('z', 1), ('e', 22))
* scala> nel.sortBy(_._2)
* res0: cats.data.NonEmptyList[(Char, Int)] = NonEmptyList((z,1), (a,4), (e,22))
* }}}
*/
def sortBy[B: Order](f: A => B): NonEmptyList[A] =
toList.sortBy(f)(Order[B].toOrdering) match {
Copy link
Collaborator

@peterneyens peterneyens Mar 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we generally use an implicit parameter (instead of a context bound) when we use the type class instance directly?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's be consistent

case x :: xs => NonEmptyList(x, xs)
case Nil => sys.error("unreachable: sorting a NonEmptyList cannot produce an empty List")
}

/**
* Sorts this `NonEmptyList` according to an `Order`
*
* {{{
* scala> import cats.data.NonEmptyList
* scala> import cats.instances.int._
* scala> val nel = NonEmptyList.of(12, 4, 3, 9)
* scala> nel.sorted
* res0: cats.data.NonEmptyList[Int] = NonEmptyList(3, 4, 9, 12)
* }}}
*/
def sorted[AA >: A](implicit AA: Order[AA]): NonEmptyList[AA] =
toList.sorted(Order[AA].toOrdering) match {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we do AA.toOrdering?

case x :: xs => NonEmptyList(x, xs)
case Nil => sys.error("unreachable: sorting a NonEmptyList cannot produce an empty List")
}

/**
* Groups elements inside of this `NonEmptyList` using a mapping function
*
Expand Down
19 changes: 19 additions & 0 deletions tests/src/test/scala/cats/tests/NonEmptyListTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,25 @@ class NonEmptyListTests extends CatsSuite {
}
}

test("NonEmptyList#last is consistent with List#last") {
forAll { nel: NonEmptyList[Int] =>
nel.last should === (nel.toList.last)
}
}

test("NonEmptyList#sorted is consistent with List#sorted") {
forAll { nel: NonEmptyList[Int] =>
nel.sorted.toList should === (nel.toList.sorted)
}
}

test("NonEmptyList#sortBy is consistent with List#sortBy") {
forAll { (nel: NonEmptyList[Int], f: Int => Int) =>
nel.sortBy(f).toList should === (nel.toList.sortBy(f))
}
}


test("NonEmptyList#groupBy is consistent with List#groupBy") {
forAll { (nel: NonEmptyList[Int], f: Int => Int) =>
nel.groupBy(f).mapValues(_.toList) should === (nel.toList.groupBy(f))
Expand Down