From da9b22889e908d10550072eb2eb52f0342a58968 Mon Sep 17 00:00:00 2001 From: yunnii Date: Tue, 16 Oct 2012 21:35:16 +0600 Subject: [PATCH 1/2] =?UTF-8?q?=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=BC=D0=B0=D1=81=D1=81=D0=B8=D0=B2=D0=B0?= =?UTF-8?q?.=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mainpage.html | 10 +++++++ mysort.js | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 mainpage.html create mode 100644 mysort.js diff --git a/mainpage.html b/mainpage.html new file mode 100644 index 0000000..0a8da55 --- /dev/null +++ b/mainpage.html @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/mysort.js b/mysort.js new file mode 100644 index 0000000..c74c4da --- /dev/null +++ b/mysort.js @@ -0,0 +1,80 @@ +/*global alert: true*/ + +/** + * Сортирует массив "пузырьком" + * @param {array} array - массив, который необходимо отсортировать + */ +function sortMassive(array) { + "use strict"; + + var l = array.length, j, i, temp; + for (j = 0; j < l; j += 1) { + for (i = 0; i < l; i += 1) { + if (array[j] < array[i]) { + temp = array[j]; + array[j] = array[i]; + array[i] = temp; + } + } + } +} + +/** + * Сравнивает массивы - отсортированный пузырьком и простой функцией sort + */ +function compareArray(real, expected) { + "use strict"; + + if (real.length !== expected.length) { + alert("Error not equal length"); + return; + } + + var i, l = real.length; + for (i = 0; i < l; i += 1) { + if (real[i] !== expected[i]) { + alert("Error!"); + return; + } + } + alert("OK"); +} + +function sortfunction(a, b) { + "use strict"; + + return a - b; +} + +function test1() { + "use strict"; + + var realArray = [2, 6, 4, 7, 1, 9, 3, 5, 8], expectedArray = [2, 6, 4, 7, 1, 9, 3, 5, 8]; + + sortMassive(realArray); + expectedArray.sort(sortfunction); + + compareArray(realArray, expectedArray); +} + +function test2() { + "use strict"; + + var realArray = [2, 6, 4, 7, 1, 10, 13, 15, 8], expectedArray = [1, 2, 4, 6, 7, 8, 10, 13, 15]; + + sortMassive(realArray); + expectedArray.sort(sortfunction); + + compareArray(realArray, expectedArray); +} + +function runTestsSort() { + "use strict"; + + test1(); + test2(); +} + + + + From 20feec552f6531eea35f6fc37f0e9f9425c95ce0 Mon Sep 17 00:00:00 2001 From: yunnii Date: Tue, 16 Oct 2012 23:42:32 +0600 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A5=D1=83=D0=B4=D0=BE=D0=B6=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Убраны табы Т_Т --- mysort.js | 76 +++++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/mysort.js b/mysort.js index c74c4da..a693647 100644 --- a/mysort.js +++ b/mysort.js @@ -2,77 +2,77 @@ /** * Сортирует массив "пузырьком" - * @param {array} array - массив, который необходимо отсортировать + * @param {array} array - массив, который необходимо отсортировать */ function sortMassive(array) { "use strict"; var l = array.length, j, i, temp; - for (j = 0; j < l; j += 1) { - for (i = 0; i < l; i += 1) { - if (array[j] < array[i]) { - temp = array[j]; - array[j] = array[i]; - array[i] = temp; - } - } - } + for (j = 0; j < l; j += 1) { + for (i = 0; i < l; i += 1) { + if (array[j] < array[i]) { + temp = array[j]; + array[j] = array[i]; + array[i] = temp; + } + } + } } /** - * Сравнивает массивы - отсортированный пузырьком и простой функцией sort + *Сравнивает массивы - отсортированный пузырьком и простой функцией sort */ function compareArray(real, expected) { - "use strict"; - - if (real.length !== expected.length) { - alert("Error not equal length"); - return; - } - - var i, l = real.length; - for (i = 0; i < l; i += 1) { - if (real[i] !== expected[i]) { - alert("Error!"); - return; - } + "use strict"; + + if (real.length !== expected.length) { + alert("Error not equal length"); + return; } - alert("OK"); + + var i, l = real.length; + for (i = 0; i < l; i += 1) { + if (real[i] !== expected[i]) { + alert("Error!"); + return; + } + } + alert("OK"); } function sortfunction(a, b) { "use strict"; - return a - b; + return a - b; } function test1() { - "use strict"; + "use strict"; - var realArray = [2, 6, 4, 7, 1, 9, 3, 5, 8], expectedArray = [2, 6, 4, 7, 1, 9, 3, 5, 8]; + var realArray = [2, 6, 4, 7, 1, 9, 3, 5, 8], expectedArray = [2, 6, 4, 7, 1, 9, 3, 5, 8]; - sortMassive(realArray); - expectedArray.sort(sortfunction); + sortMassive(realArray); + expectedArray.sort(sortfunction); - compareArray(realArray, expectedArray); + compareArray(realArray, expectedArray); } function test2() { - "use strict"; + "use strict"; - var realArray = [2, 6, 4, 7, 1, 10, 13, 15, 8], expectedArray = [1, 2, 4, 6, 7, 8, 10, 13, 15]; + var realArray = [2, 6, 4, 7, 1, 10, 13, 15, 8], expectedArray = [1, 2, 4, 6, 7, 8, 10, 13, 15]; - sortMassive(realArray); - expectedArray.sort(sortfunction); + sortMassive(realArray); + expectedArray.sort(sortfunction); - compareArray(realArray, expectedArray); + compareArray(realArray, expectedArray); } function runTestsSort() { "use strict"; - test1(); - test2(); + test1(); + test2(); }