From 17ba9da2b4d98a61c6dc785b6fdbb70276b70ada Mon Sep 17 00:00:00 2001
From: Amaras <amaras@vivaldi.net>
Date: Wed, 15 Jul 2020 15:26:17 +0200
Subject: [PATCH 1/5] Added Bubblesort in Coconut

---
 contents/bubble_sort/bubble_sort.md               |  4 ++++
 contents/bubble_sort/code/coconut/bubblesort.coco | 15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 contents/bubble_sort/code/coconut/bubblesort.coco

diff --git a/contents/bubble_sort/bubble_sort.md b/contents/bubble_sort/bubble_sort.md
index 8b5b6b8e8..df80886f7 100644
--- a/contents/bubble_sort/bubble_sort.md
+++ b/contents/bubble_sort/bubble_sort.md
@@ -78,6 +78,8 @@ This means that we need to go through the vector $$\mathcal{O}(n^2)$$ times with
 [import:1-6, lang:"coffeescript"](code/coffeescript/bubblesort.coffee)
 {% sample lang="r" %}
 [import:1-12, lang:"r"](code/r/bubble_sort.R)
+{% sample lang="coco" %}
+[import:3-8, lang:"coconut"](code/coconut/bubblesort.coco)
 {% endmethod %}
 
 ... And that's it for the simplest bubble sort method.
@@ -159,6 +161,8 @@ The code snippet was taken from this [Scratch project](https://scratch.mit.edu/p
 [import, lang:"coffeescript"](code/coffeescript/bubblesort.coffee)
 {% sample lang="r" %}
 [import, lang:"r"](code/r/bubble_sort.R)
+{% sample lang="coco" %}
+[import, long:"coconut"](code/coconut/bubblesort.coco)
 {% endmethod %}
 
 <script>
diff --git a/contents/bubble_sort/code/coconut/bubblesort.coco b/contents/bubble_sort/code/coconut/bubblesort.coco
new file mode 100644
index 000000000..b36d93624
--- /dev/null
+++ b/contents/bubble_sort/code/coconut/bubblesort.coco
@@ -0,0 +1,15 @@
+import random
+
+def bubble_sort(array):
+	length = len(array)
+	for i in range(length):
+		for j in range(length - i - 1):
+			if array[j] > array[j + 1]:
+				array[j], array[j + 1] = array[j + 1], array[j]
+
+
+if __name__ == '__main__':
+	array = range(10) |> map$(-> random.randint(0, 1000)) |> list
+	print('Before sorting:', array)
+	bubble_sort(array)
+	print('After sorting:', array)

From 51dc51b2997dbb2a6dc53459371bbd4aa42de4c3 Mon Sep 17 00:00:00 2001
From: Amaras <amaras@vivaldi.net>
Date: Fri, 17 Jul 2020 14:29:30 +0200
Subject: [PATCH 2/5] corrected a typo

---
 contents/bubble_sort/bubble_sort.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents/bubble_sort/bubble_sort.md b/contents/bubble_sort/bubble_sort.md
index df80886f7..db979a429 100644
--- a/contents/bubble_sort/bubble_sort.md
+++ b/contents/bubble_sort/bubble_sort.md
@@ -162,7 +162,7 @@ The code snippet was taken from this [Scratch project](https://scratch.mit.edu/p
 {% sample lang="r" %}
 [import, lang:"r"](code/r/bubble_sort.R)
 {% sample lang="coco" %}
-[import, long:"coconut"](code/coconut/bubblesort.coco)
+[import, lang:"coconut"](code/coconut/bubblesort.coco)
 {% endmethod %}
 
 <script>

From 9f097ed6edd210b28aae8be9d87c8c31aa80e41d Mon Sep 17 00:00:00 2001
From: Amaras <amaras@vivaldi.net>
Date: Sun, 19 Jul 2020 17:34:42 +0200
Subject: [PATCH 3/5] Addressed @berquist review: functional style

---
 .../bubble_sort/code/coconut/bubblesort.coco  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/contents/bubble_sort/code/coconut/bubblesort.coco b/contents/bubble_sort/code/coconut/bubblesort.coco
index b36d93624..53845fc83 100644
--- a/contents/bubble_sort/code/coconut/bubblesort.coco
+++ b/contents/bubble_sort/code/coconut/bubblesort.coco
@@ -1,15 +1,15 @@
 import random
 
-def bubble_sort(array):
-	length = len(array)
-	for i in range(length):
-		for j in range(length - i - 1):
-			if array[j] > array[j + 1]:
-				array[j], array[j + 1] = array[j + 1], array[j]
+def swap_till(x, []) = [x]
+addpattern def swap_till(x, [y] + rest) =
+    [min(x, y)] + swap_till(max(x, y), rest)
+addpattern def swap_till(x, y is int) = [min(x, y), max(x, y)]
 
 
+bubble_sort = reduce$((x, y) -> swap_till(y, x))
+
 if __name__ == '__main__':
-	array = range(10) |> map$(-> random.randint(0, 1000)) |> list
-	print('Before sorting:', array)
-	bubble_sort(array)
-	print('After sorting:', array)
+    array = range(10) |> map$(-> random.randint(0, 1000)) |> list
+    print('Before sorting:', array)
+    array = bubble_sort(array) |> list
+    print('After sorting:', array)

From 80d05f56c4c84849b39b2eadfb33acb1b1df45d4 Mon Sep 17 00:00:00 2001
From: Amaras <amaras@vivaldi.net>
Date: Sun, 19 Jul 2020 17:36:37 +0200
Subject: [PATCH 4/5] Changed the order and added some space.

---
 contents/bubble_sort/code/coconut/bubblesort.coco | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contents/bubble_sort/code/coconut/bubblesort.coco b/contents/bubble_sort/code/coconut/bubblesort.coco
index 53845fc83..67eae8905 100644
--- a/contents/bubble_sort/code/coconut/bubblesort.coco
+++ b/contents/bubble_sort/code/coconut/bubblesort.coco
@@ -1,9 +1,12 @@
 import random
 
 def swap_till(x, []) = [x]
+
+addpattern def swap_till(x, y is int) = [min(x, y), max(x, y)]
+
 addpattern def swap_till(x, [y] + rest) =
     [min(x, y)] + swap_till(max(x, y), rest)
-addpattern def swap_till(x, y is int) = [min(x, y), max(x, y)]
+
 
 
 bubble_sort = reduce$((x, y) -> swap_till(y, x))

From 0ded8d9c1488b337026813af69e502324ce4d609 Mon Sep 17 00:00:00 2001
From: Amaras <amaras@vivaldi.net>
Date: Sun, 19 Jul 2020 17:37:43 +0200
Subject: [PATCH 5/5] Modified the md file. Should be good to go

---
 contents/bubble_sort/bubble_sort.md               | 2 +-
 contents/bubble_sort/code/coconut/bubblesort.coco | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/contents/bubble_sort/bubble_sort.md b/contents/bubble_sort/bubble_sort.md
index db979a429..27071de4a 100644
--- a/contents/bubble_sort/bubble_sort.md
+++ b/contents/bubble_sort/bubble_sort.md
@@ -79,7 +79,7 @@ This means that we need to go through the vector $$\mathcal{O}(n^2)$$ times with
 {% sample lang="r" %}
 [import:1-12, lang:"r"](code/r/bubble_sort.R)
 {% sample lang="coco" %}
-[import:3-8, lang:"coconut"](code/coconut/bubblesort.coco)
+[import:3-10, lang:"coconut"](code/coconut/bubblesort.coco)
 {% endmethod %}
 
 ... And that's it for the simplest bubble sort method.
diff --git a/contents/bubble_sort/code/coconut/bubblesort.coco b/contents/bubble_sort/code/coconut/bubblesort.coco
index 67eae8905..7bafe1d73 100644
--- a/contents/bubble_sort/code/coconut/bubblesort.coco
+++ b/contents/bubble_sort/code/coconut/bubblesort.coco
@@ -7,8 +7,6 @@ addpattern def swap_till(x, y is int) = [min(x, y), max(x, y)]
 addpattern def swap_till(x, [y] + rest) =
     [min(x, y)] + swap_till(max(x, y), rest)
 
-
-
 bubble_sort = reduce$((x, y) -> swap_till(y, x))
 
 if __name__ == '__main__':