From b5d688fb4767de553db822ffab4dc77f3ec5b1be Mon Sep 17 00:00:00 2001 From: keyhit Date: Mon, 14 Nov 2016 22:10:38 +0200 Subject: [PATCH 1/3] Homework_2 --- .../homework_2/index.htm | 12 ++ .../homework_2/js/main.js | 105 ++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 homeworks/viacheslav.karpenko_keyhit/homework_2/index.htm create mode 100644 homeworks/viacheslav.karpenko_keyhit/homework_2/js/main.js diff --git a/homeworks/viacheslav.karpenko_keyhit/homework_2/index.htm b/homeworks/viacheslav.karpenko_keyhit/homework_2/index.htm new file mode 100644 index 00000000..9c8e8211 --- /dev/null +++ b/homeworks/viacheslav.karpenko_keyhit/homework_2/index.htm @@ -0,0 +1,12 @@ + + + + + Hometask 1 JavaScript Language + + + + + + + \ No newline at end of file diff --git a/homeworks/viacheslav.karpenko_keyhit/homework_2/js/main.js b/homeworks/viacheslav.karpenko_keyhit/homework_2/js/main.js new file mode 100644 index 00000000..017e811e --- /dev/null +++ b/homeworks/viacheslav.karpenko_keyhit/homework_2/js/main.js @@ -0,0 +1,105 @@ +(function () { +// 1. Create empty array - myArray +console.log(' - 1 - Created empty array - myArray'); + +var myArray = []; + +console.log('myArray'); // check array + +//2. Filling myArray +console.log(' - 2 - Filled myArray'); + + for (var i = 1; i <=100; i++) { + function randomInteger(min, max) { + var rand = min - 0.5 + Math.random() * (max - min + 1); + rand = Math.round(rand); + return rand; // returning 100 numbers between 1 - 100 values + } + + myArray.push(randomInteger(1, 100)); // adding values to array + + } +console.log(myArray); // show all elements + +// 3. Function findMinMax +console.log(' - 3 - Function findMinMax'); + +var arrayToFind = myArray; // get array + +function findMinMax(arrayToFind, line){ + + if (line == 'max') { + return 'Array maximum number = ' + Math.max.apply(Math, myArray); // searching max value + } + + if (line == 'min') { + return 'Array minimum number = ' + Math.min.apply(Math, myArray); // searching min value + } +} + +var resultMax = findMinMax(arrayToFind, 'max'); // asking max value +var resultMin = findMinMax(arrayToFind, 'min'); // asking min value + +console.log(resultMax); // showing max value +console.log(resultMin); // showing min value + +// 4. Convert array to object +console.log(' - 4 - Convert array to object'); + +var ArrForObj = []; + +for (var f = 1; f <=30; f++) { + ArrForObj.push(f); +} + +function convertArrayToObj(convertedArr) { + + var obj = {}; // Create new object + var charCount = 26; // 26 english letters + var num = 1; // start number for increase + + for (var i = 0; i < convertedArr.length; i++) { // start iteration ArrForObj + if (charCount > 0) { // if enlish symbols > 0 + obj[String.fromCharCode(97 + i)] = convertedArr[i]; // adding to obj symbols = ArrForObj elements + } + else { // if enlish symbols < 0 + obj[num] = convertedArr[i]; // adding to obj num var = ArrForObj elements + num++; // increase var num value + } + charCount--; // decrease char code val of english letters + } + return obj; // returning object +} + +var myObj = convertArrayToObj(ArrForObj); // Calling convertArrayToObj +console.log(myObj); // show inconsole + +// 5. filtering data +console.log(' - 5 - Filtering array data'); + +var newData = [2, 12, 22, 6, 32]; // Array newData + +var oldData = [12, 5, 7, 17, 22, 32]; // Array oldData + + function filterNew(newArray, oldArray) { + + for (var h = 0; h < newArray.length; h++) { // Iterations newData array - searching values + + oldArray.forEach(function(oldDataArrayElem){ // Iterations oldData array - searching values + + if (newArray[h] == oldDataArrayElem){ // Comparisons values both arrays + + newArray.splice(h, 1); // Splice used if values is same + + h--; // Decrease index newData array iterations + + } + }); + } + } + +filterNew(newData, oldData); + +console.log(newData); + +})(); From 03cdce631fdc2550493f20cb254e2645e39b8fdc Mon Sep 17 00:00:00 2001 From: keyhit Date: Tue, 15 Nov 2016 00:14:49 +0200 Subject: [PATCH 2/3] added last line to index.html file --- homeworks/viacheslav.karpenko_keyhit/homework_2/index.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeworks/viacheslav.karpenko_keyhit/homework_2/index.htm b/homeworks/viacheslav.karpenko_keyhit/homework_2/index.htm index 9c8e8211..62bc7f01 100644 --- a/homeworks/viacheslav.karpenko_keyhit/homework_2/index.htm +++ b/homeworks/viacheslav.karpenko_keyhit/homework_2/index.htm @@ -9,4 +9,4 @@ - \ No newline at end of file + From 062f0616f4b474fa705487bdfbba525c5c2dcb8f Mon Sep 17 00:00:00 2001 From: keyhit Date: Tue, 15 Nov 2016 08:54:01 +0200 Subject: [PATCH 3/3] Reformating text --- .../homework_2/js/main.js | 101 +++++++++--------- 1 file changed, 48 insertions(+), 53 deletions(-) diff --git a/homeworks/viacheslav.karpenko_keyhit/homework_2/js/main.js b/homeworks/viacheslav.karpenko_keyhit/homework_2/js/main.js index 017e811e..22c123db 100644 --- a/homeworks/viacheslav.karpenko_keyhit/homework_2/js/main.js +++ b/homeworks/viacheslav.karpenko_keyhit/homework_2/js/main.js @@ -8,17 +8,18 @@ console.log('myArray'); // check array //2. Filling myArray console.log(' - 2 - Filled myArray'); - - for (var i = 1; i <=100; i++) { - function randomInteger(min, max) { - var rand = min - 0.5 + Math.random() * (max - min + 1); - rand = Math.round(rand); - return rand; // returning 100 numbers between 1 - 100 values - } - - myArray.push(randomInteger(1, 100)); // adding values to array - - } + +for (var i = 1; i <=100; i++) { + function randomInteger(min, max) { + var rand = min - 0.5 + Math.random() * (max - min + 1); + rand = Math.round(rand); + return rand; // returning 100 numbers between 1 - 100 values + } + + myArray.push(randomInteger(1, 100)); // adding values to array + +} + console.log(myArray); // show all elements // 3. Function findMinMax @@ -27,14 +28,14 @@ console.log(' - 3 - Function findMinMax'); var arrayToFind = myArray; // get array function findMinMax(arrayToFind, line){ - - if (line == 'max') { - return 'Array maximum number = ' + Math.max.apply(Math, myArray); // searching max value - } - - if (line == 'min') { - return 'Array minimum number = ' + Math.min.apply(Math, myArray); // searching min value - } + + if (line == 'max') { + return 'Array maximum number = ' + Math.max.apply(Math, myArray); // searching max value + } + + if(line == 'min') { + return 'Array minimum number = ' + Math.min.apply(Math, myArray); // searching min value + } } var resultMax = findMinMax(arrayToFind, 'max'); // asking max value @@ -44,59 +45,53 @@ console.log(resultMax); // showing max value console.log(resultMin); // showing min value // 4. Convert array to object -console.log(' - 4 - Convert array to object'); +console.log(' - 4 - Convert array to object'); var ArrForObj = []; for (var f = 1; f <=30; f++) { - ArrForObj.push(f); + ArrForObj.push(f); } function convertArrayToObj(convertedArr) { - var obj = {}; // Create new object - var charCount = 26; // 26 english letters - var num = 1; // start number for increase - - for (var i = 0; i < convertedArr.length; i++) { // start iteration ArrForObj - if (charCount > 0) { // if enlish symbols > 0 - obj[String.fromCharCode(97 + i)] = convertedArr[i]; // adding to obj symbols = ArrForObj elements - } - else { // if enlish symbols < 0 - obj[num] = convertedArr[i]; // adding to obj num var = ArrForObj elements - num++; // increase var num value + var obj = {}; // Create new object + var charCount = 26; // 26 english letters + var num = 1; // start number for increase + + for (var i = 0; i < convertedArr.length; i++) { // start iteration ArrForObj + if (charCount > 0) { // if enlish symbols > 0 + obj[String.fromCharCode(97 + i)] = convertedArr[i]; // adding to obj symbols = ArrForObj elements + } + else { // if enlish symbols < 0 + obj[num] = convertedArr[i]; // adding to obj num var = ArrForObj elements + num++; // increase var num value + } + charCount--; // decrease char code val of english letters } - charCount--; // decrease char code val of english letters - } - return obj; // returning object +return obj; // returning object } -var myObj = convertArrayToObj(ArrForObj); // Calling convertArrayToObj -console.log(myObj); // show inconsole +var myObj = convertArrayToObj(ArrForObj); // Calling convertArrayToObj +console.log(myObj); // show inconsole // 5. filtering data -console.log(' - 5 - Filtering array data'); - -var newData = [2, 12, 22, 6, 32]; // Array newData +console.log(' - 5 - Filtering array data'); -var oldData = [12, 5, 7, 17, 22, 32]; // Array oldData +var newData = [2, 12, 22, 6, 32]; // Array newData +var oldData = [12, 5, 7, 17, 22, 32]; // Array oldData - function filterNew(newArray, oldArray) { +function filterNew(newArray, oldArray) { - for (var h = 0; h < newArray.length; h++) { // Iterations newData array - searching values - - oldArray.forEach(function(oldDataArrayElem){ // Iterations oldData array - searching values - - if (newArray[h] == oldDataArrayElem){ // Comparisons values both arrays - - newArray.splice(h, 1); // Splice used if values is same - - h--; // Decrease index newData array iterations - + for (var h = 0; h < newArray.length; h++) { // Iterations newData array - searching values + oldArray.forEach(function(oldDataArrayElem){ // Iterations oldData array - searching values + if (newArray[h] == oldDataArrayElem){ // Comparisons values both arrays + newArray.splice(h, 1); // Splice used if values is same + h--; // Decrease index newData array iterations } }); } - } +} filterNew(newData, oldData);