Skip to content
Snippets Groups Projects
Commit 287dc3d4 authored by Swen Jacobs's avatar Swen Jacobs
Browse files

updated testcases

parent 019b1fad
No related branches found
No related tags found
No related merge requests found
import scala.collection.immutable.Set
import scala.collection.immutable.Multiset
object BinarySearchTree {
sealed abstract class Tree
......
......@@ -14,7 +14,7 @@ object InsertionSort {
case Nil() => true
case Cons(x, xs) => xs match {
case Nil() => true
case Cons(y, ys) => x < y && isSorted(Cons(y, xs))
case Cons(y, ys) => x <= y && isSorted(Cons(y, xs))
}
}
......@@ -23,15 +23,15 @@ object InsertionSort {
case Cons(x,xs) => if (x < e) Cons(x,sortedIns(e, xs)) else Cons(e, l)
}) ensuring(res => contents(res) == contents(l) ++ Set(e))
def sorted(l: List): List = (l match {
def sort(l: List): List = (l match {
case Nil() => Nil()
case Cons(x,xs) => sortedIns(x, sorted(xs))
case Cons(x,xs) => sortedIns(x, sort(xs))
}) ensuring(res => contents(res) == contents(l))// && isSorted(res))
def main(args: Array[String]): Unit = {
val ls: List = Cons(5, Cons(2, Cons(4, Cons(5, Cons(1, Cons(8,Nil()))))))
println(ls)
println(sorted(ls))
println(sort(ls))
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment