From ec052863a655da27c4219445f55c30da3473820a Mon Sep 17 00:00:00 2001 From: Matt Wu Date: Thu, 25 May 2017 13:22:55 -0400 Subject: [PATCH 1/3] finished, def could be improve more --- index.html | 4 ++-- js/script.js | 31 ++++++++++++++++++++++++------- test.html | 22 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 test.html diff --git a/index.html b/index.html index ef273b7..b97cc31 100755 --- a/index.html +++ b/index.html @@ -20,8 +20,8 @@

Loops Exercises

diff --git a/js/script.js b/js/script.js index c36bf4a..74d015f 100755 --- a/js/script.js +++ b/js/script.js @@ -2,12 +2,29 @@ var display = document.getElementById("display"); -function yourFunctionName (){ - display.innerHTML = "hello"; + +function zipArrays() { + var input1 = prompt("Please enter your first array."); + var input2 = prompt("Please enter your second array."); + var arr1 = input1.replace(/[^0-9]/g,'').split(""); + var arr2 = input2.replace(/[^0-9]/g,'').split(""); + var result = []; + var maxLength = (arr1.length >= arr2.length) ?arr1.length :arr2.length; + + for (var i = 0; i < maxLength; i++) { + if (arr1[i] != null){ + result.push(arr1[i]); + } + if (arr2[i] != null){ + result.push(arr2[i]); + } + } + display.innerHTML = "Your combined array is: [" + result + "]"; } -function example(){ - var v = 3 +4; - - display.innerHTML = v; -} \ No newline at end of file +function largestPossibleNumber(){ + var input1 = prompt("Please enter your array."); + var tempArr = input1.replace(/[^0-9]/g,''); + var result = tempArr.split("").sort().reverse().join(""); + display.innerHTML = "Your input is: ["+ input1 + "]"+ "
The Largest Possible Number is: "+result; +} diff --git a/test.html b/test.html new file mode 100644 index 0000000..f62830d --- /dev/null +++ b/test.html @@ -0,0 +1,22 @@ + + + + + + + + + From 080878b7c6202c16a95d1d09225e6e08be0fc31d Mon Sep 17 00:00:00 2001 From: Matt Wu Date: Thu, 25 May 2017 16:46:03 -0400 Subject: [PATCH 2/3] finished --- js/script.js | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/js/script.js b/js/script.js index 74d015f..4fa87ba 100755 --- a/js/script.js +++ b/js/script.js @@ -8,18 +8,31 @@ function zipArrays() { var input2 = prompt("Please enter your second array."); var arr1 = input1.replace(/[^0-9]/g,'').split(""); var arr2 = input2.replace(/[^0-9]/g,'').split(""); - var result = []; - var maxLength = (arr1.length >= arr2.length) ?arr1.length :arr2.length; - for (var i = 0; i < maxLength; i++) { - if (arr1[i] != null){ - result.push(arr1[i]); + if(arr1.length >= arr2.length) { + for(var i = 1; i < arr2.length; i++){ + arr1.splice(i, 0, arr2[i-1]); } - if (arr2[i] != null){ - result.push(arr2[i]); + display.innerHTML = "Your combined array is: [" + arr1 + "]"; + }else{ + for(var i = 0; i < arr1.length; i++){ + arr2.splice(0, 0, arr2[i]); } + display.innerHTML = "Your combined array is: [" + arr2 + "]"; } - display.innerHTML = "Your combined array is: [" + result + "]"; +} + // var result = []; + // var maxLength = (arr1.length >= arr2.length) ?arr1.length :arr2.length; + // + // for (var i = 0; i < maxLength; i++) { + // if (arr1[i] != null){ + // result.push(arr1[i]); + // } + // if (arr2[i] != null){ + // result.push(arr2[i]); + // } + // } + //display.innerHTML = "Your combined array is: [" + result + "]"; } function largestPossibleNumber(){ From 5180f33e8f249389c16be6597078448330878135 Mon Sep 17 00:00:00 2001 From: Matt Wu Date: Thu, 25 May 2017 16:53:15 -0400 Subject: [PATCH 3/3] minor modification --- js/script.js | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/js/script.js b/js/script.js index 4fa87ba..427456d 100755 --- a/js/script.js +++ b/js/script.js @@ -2,38 +2,26 @@ var display = document.getElementById("display"); - function zipArrays() { var input1 = prompt("Please enter your first array."); var input2 = prompt("Please enter your second array."); var arr1 = input1.replace(/[^0-9]/g,'').split(""); var arr2 = input2.replace(/[^0-9]/g,'').split(""); - + //always small one add to the bigger one if(arr1.length >= arr2.length) { + arr1.splice(1, 0, arr2[0]); for(var i = 1; i < arr2.length; i++){ - arr1.splice(i, 0, arr2[i-1]); + arr1.splice(2*i+1, 0, arr2[i]); } - display.innerHTML = "Your combined array is: [" + arr1 + "]"; + display.innerHTML = "The comined array is: [" + arr1 + "]"; }else{ - for(var i = 0; i < arr1.length; i++){ - arr2.splice(0, 0, arr2[i]); + arr2.splice(0, 0, arr1[0]); + for(var i = 1; i < arr1.length; i++){ + arr2.splice(i+1, 0, arr1[i]); } - display.innerHTML = "Your combined array is: [" + arr2 + "]"; + display.innerHTML = "The comined array is: [" + arr2 + "]"; } } - // var result = []; - // var maxLength = (arr1.length >= arr2.length) ?arr1.length :arr2.length; - // - // for (var i = 0; i < maxLength; i++) { - // if (arr1[i] != null){ - // result.push(arr1[i]); - // } - // if (arr2[i] != null){ - // result.push(arr2[i]); - // } - // } - //display.innerHTML = "Your combined array is: [" + result + "]"; -} function largestPossibleNumber(){ var input1 = prompt("Please enter your array.");