From 287dc3d430ffc22c32955e1c521e0c762815104f Mon Sep 17 00:00:00 2001
From: Swen Jacobs <swen.jacobs@epfl.ch>
Date: Mon, 12 Jul 2010 13:47:32 +0000
Subject: [PATCH] updated testcases
---
testcases/BinarySearchTree.scala | 1 +
testcases/InsertionSort.scala | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/testcases/BinarySearchTree.scala b/testcases/BinarySearchTree.scala
index 9b8dbc159..396678886 100644
--- a/testcases/BinarySearchTree.scala
+++ b/testcases/BinarySearchTree.scala
@@ -1,4 +1,5 @@
import scala.collection.immutable.Set
+import scala.collection.immutable.Multiset
object BinarySearchTree {
sealed abstract class Tree
diff --git a/testcases/InsertionSort.scala b/testcases/InsertionSort.scala
index 02031140b..50fcf358b 100644
--- a/testcases/InsertionSort.scala
+++ b/testcases/InsertionSort.scala
@@ -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))
}
}
--
GitLab