Skip to content
Snippets Groups Projects
Commit 6dea823a authored by Viktor Kuncak's avatar Viktor Kuncak
Browse files

Made merge sort verify using better specified splitAtIndex.

parent 2c0436d5
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,7 @@ import leon.lang.synthesis.choose ...@@ -9,6 +9,7 @@ import leon.lang.synthesis.choose
package object par { package object par {
// @library // @library
@inline
def parallel[A,B](x: => A, y: => B) : (A,B) = { def parallel[A,B](x: => A, y: => B) : (A,B) = {
(x,y) (x,y)
} }
......
...@@ -18,7 +18,8 @@ object MergeSort { ...@@ -18,7 +18,8 @@ object MergeSort {
def msort[T](less: (T, T) => Boolean)(l: List[T]): List[T] = { def msort[T](less: (T, T) => Boolean)(l: List[T]): List[T] = {
if (l.size <= 1) l if (l.size <= 1) l
else { else {
val (first, second) = l.evenSplit val c = l.length/2
val (first, second) = l.splitAtIndex(c) // evenSplit
merge(less)(msort(less)(first), msort(less)(second)) merge(less)(msort(less)(first), msort(less)(second))
} }
} ensuring { res => res.content == l.content && res.size == l.size } } ensuring { res => res.content == l.content && res.size == l.size }
......
...@@ -19,9 +19,11 @@ object MergeSortPar { ...@@ -19,9 +19,11 @@ object MergeSortPar {
def msort[T](less: (T, T) => Boolean)(l: List[T]): List[T] = { def msort[T](less: (T, T) => Boolean)(l: List[T]): List[T] = {
if (l.size <= 1) l if (l.size <= 1) l
else { else {
val (first, second) = l.evenSplit val c = l.length/2
val (first, second) = l.splitAtIndex(c) // evenSplit
val (s1, s2) = parallel(msort(less)(first), msort(less)(second)) val (s1, s2) = parallel(msort(less)(first), msort(less)(second))
merge(less)(s1, s2) merge(less)(s1, s2)
} }
} ensuring { res => res.content == l.content && res.size == l.size } } ensuring { res => res.content == l.content &&
res.size == l.size }
} }
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