From 6d2920dba1bca3a4196c2609a6beb9858b1f0d3a Mon Sep 17 00:00:00 2001 From: CD Sigma Date: Sat, 21 Jul 2018 22:21:56 -0700 Subject: [PATCH 1/3] Implementation Edit to Bogo Sort in Java - Added main() - bogoSort() now returns the sorted array --- contents/bogo_sort/bogo_sort.md | 2 +- contents/bogo_sort/code/javascript/bogo.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/contents/bogo_sort/bogo_sort.md b/contents/bogo_sort/bogo_sort.md index 3278de306..8c6301fbf 100644 --- a/contents/bogo_sort/bogo_sort.md +++ b/contents/bogo_sort/bogo_sort.md @@ -24,7 +24,7 @@ In code, it looks something like this: {% sample lang="java" %} [import:2-6, lang:"java"](code/java/bogo.java) {% sample lang="js" %} -[import:11-15, lang:"javascript"](code/javascript/bogo.js) +[import:11-16, lang:"javascript"](code/javascript/bogo.js) {% sample lang="py" %} [import:10-12, lang:"python"](code/python/bogo.py) {% sample lang="hs" %} diff --git a/contents/bogo_sort/code/javascript/bogo.js b/contents/bogo_sort/code/javascript/bogo.js index 71f84b6d3..094d4aee1 100644 --- a/contents/bogo_sort/code/javascript/bogo.js +++ b/contents/bogo_sort/code/javascript/bogo.js @@ -12,6 +12,7 @@ function bogoSort(arr) { while (!isSorted(arr)) { shuffle(arr); } + return arr; } function shuffle(arr) { @@ -22,3 +23,10 @@ function shuffle(arr) { arr[r] = tmp; } } + +function main() { + var testArray = [4,5,123,24,34,-5]; + print(bogoSort(testArray)); +} + +main(); From 703dc78e55b3598ea50d3270022a8f5f7324d694 Mon Sep 17 00:00:00 2001 From: CD Sigma Date: Sun, 22 Jul 2018 12:11:01 -0700 Subject: [PATCH 2/3] Javascript fixes --- contents/bogo_sort/bogo_sort.md | 2 +- contents/bogo_sort/code/javascript/bogo.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contents/bogo_sort/bogo_sort.md b/contents/bogo_sort/bogo_sort.md index 8c6301fbf..3278de306 100644 --- a/contents/bogo_sort/bogo_sort.md +++ b/contents/bogo_sort/bogo_sort.md @@ -24,7 +24,7 @@ In code, it looks something like this: {% sample lang="java" %} [import:2-6, lang:"java"](code/java/bogo.java) {% sample lang="js" %} -[import:11-16, lang:"javascript"](code/javascript/bogo.js) +[import:11-15, lang:"javascript"](code/javascript/bogo.js) {% sample lang="py" %} [import:10-12, lang:"python"](code/python/bogo.py) {% sample lang="hs" %} diff --git a/contents/bogo_sort/code/javascript/bogo.js b/contents/bogo_sort/code/javascript/bogo.js index 094d4aee1..844cbb320 100644 --- a/contents/bogo_sort/code/javascript/bogo.js +++ b/contents/bogo_sort/code/javascript/bogo.js @@ -12,7 +12,6 @@ function bogoSort(arr) { while (!isSorted(arr)) { shuffle(arr); } - return arr; } function shuffle(arr) { @@ -25,8 +24,9 @@ function shuffle(arr) { } function main() { - var testArray = [4,5,123,24,34,-5]; - print(bogoSort(testArray)); + let testArray = [4, 5, 123, 24, 34, -5]; + bogoSort(testArray); + console.log(testArray); } main(); From 5d18a7cf11b9e0ddda10cfbb8871023b38d25384 Mon Sep 17 00:00:00 2001 From: CDsigma Date: Sun, 22 Jul 2018 15:27:14 -0700 Subject: [PATCH 3/3] javascript fix --- contents/bogo_sort/code/javascript/bogo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents/bogo_sort/code/javascript/bogo.js b/contents/bogo_sort/code/javascript/bogo.js index 844cbb320..2559632e8 100644 --- a/contents/bogo_sort/code/javascript/bogo.js +++ b/contents/bogo_sort/code/javascript/bogo.js @@ -24,7 +24,7 @@ function shuffle(arr) { } function main() { - let testArray = [4, 5, 123, 24, 34, -5]; + const testArray = [4, 5, 123, 24, 34, -5]; bogoSort(testArray); console.log(testArray); }