From 0eddc78b51da395afb587cc68a1c0b5ad4c9af43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Blanc?= <regwblanc@gmail.com>
Date: Tue, 10 Apr 2012 17:27:50 +0200
Subject: [PATCH] just need to add precondition and postcondition...
---
mytest/BubbleFun.scala | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/mytest/BubbleFun.scala b/mytest/BubbleFun.scala
index 2ba3c1645..a28ae6540 100644
--- a/mytest/BubbleFun.scala
+++ b/mytest/BubbleFun.scala
@@ -1,5 +1,6 @@
object BubbleFun {
+ // --------------------- sort ----------------------
def sort(a: Map[Int,Int], size: Int): Map[Int,Int] = {
val i = size - 1
@@ -28,6 +29,7 @@ object BubbleFun {
sortNestedWhile(newSortedArray, (j + 1), sortedArray2, i, size, i2, sortedArray3, a)
} else (sortedArray, j)
+ // --------------------- sorted --------------------
def sorted(a: Map[Int,Int], size: Int, l: Int, u: Int) : Boolean = {
val t = sortedWhile(true, l, l, u, a, size, l)
@@ -43,22 +45,7 @@ object BubbleFun {
} else (isSorted, k)
- def isArray(a: Map[Int,Int], size: Int): Boolean =
- if((size <= 0))
- false
- else
- isArrayRec(0, size, a)
-
- def isArrayRec(i: Int, size: Int, a: Map[Int,Int]): Boolean =
- if (i >= size)
- true
- else {
- if (a.isDefinedAt(i))
- isArrayRec(i + 1, size, a)
- else
- false
- }
-
+ // ------------- partitioned ------------------
def partitioned(a: Map[Int,Int], size: Int, l1: Int, u1: Int, l2: Int, u2: Int) : Boolean = {
val t = partitionedWhile(l2, true, l1, l1, size, u2, l2, l2, u1, l1, a)
@@ -87,5 +74,23 @@ object BubbleFun {
j + 1, l1, u1, size, j2, u2, a, j3, l2, i2, i)
} else (isPartitionned, j)
+ //------------ isArray -------------------
+
+ def isArray(a: Map[Int,Int], size: Int): Boolean =
+ if((size <= 0))
+ false
+ else
+ isArrayRec(0, size, a)
+
+ def isArrayRec(i: Int, size: Int, a: Map[Int,Int]): Boolean =
+ if (i >= size)
+ true
+ else {
+ if (a.isDefinedAt(i))
+ isArrayRec(i + 1, size, a)
+ else
+ false
+ }
+
}
--
GitLab