From 667b7cfef3e7ac4a3b47124c51d3b1c706eba74f Mon Sep 17 00:00:00 2001 From: Brandon Sarazin Date: Wed, 11 May 2022 15:19:32 -0400 Subject: [PATCH 1/4] lab01-03 --- .../lab01-03/lab01 lab02py/index.html | 12 +++ .../lab01-03/lab01 lab02py/script.js | 31 ++++++++ .../lab01-03/lab01 lab04py/index.html | 13 ++++ .../lab01-03/lab01 lab04py/script.js | 76 +++++++++++++++++++ .../lab01-03/lab01 lab09py/index.html | 13 ++++ .../lab01-03/lab01 lab09py/script.js | 41 ++++++++++ 6 files changed, 186 insertions(+) create mode 100644 code/Brandon/javascript/lab01-03/lab01 lab02py/index.html create mode 100644 code/Brandon/javascript/lab01-03/lab01 lab02py/script.js create mode 100644 code/Brandon/javascript/lab01-03/lab01 lab04py/index.html create mode 100644 code/Brandon/javascript/lab01-03/lab01 lab04py/script.js create mode 100644 code/Brandon/javascript/lab01-03/lab01 lab09py/index.html create mode 100644 code/Brandon/javascript/lab01-03/lab01 lab09py/script.js diff --git a/code/Brandon/javascript/lab01-03/lab01 lab02py/index.html b/code/Brandon/javascript/lab01-03/lab01 lab02py/index.html new file mode 100644 index 00000000..79fd02a8 --- /dev/null +++ b/code/Brandon/javascript/lab01-03/lab01 lab02py/index.html @@ -0,0 +1,12 @@ + + + + + + + Document + + + + + \ No newline at end of file diff --git a/code/Brandon/javascript/lab01-03/lab01 lab02py/script.js b/code/Brandon/javascript/lab01-03/lab01 lab02py/script.js new file mode 100644 index 00000000..f233282a --- /dev/null +++ b/code/Brandon/javascript/lab01-03/lab01 lab02py/script.js @@ -0,0 +1,31 @@ +// Version 1 +let numbers; +let sums = 0; + +// numbers = [5, 0, 8, 3, 4, 1, 6]; +// sums = 0; + +// for (let i = 0; i < numbers.length; i++) { +// sums += numbers[i]; +// console.log(sums); +// } + +// Version 2 +numbers = []; +let total = 0; +while (true) { + let user_input = parseInt( + prompt("Add a number to the list. Hit cancel to calculate the average. ") + ); + if (isNaN(user_input)) { + for (let i = 0; i < numbers.length; i++) { + sums += numbers[i]; + } + total = sums / numbers.length; + console.log(numbers); + console.log(total); + break; + } + numbers.push(user_input); + console.log(numbers); +} diff --git a/code/Brandon/javascript/lab01-03/lab01 lab04py/index.html b/code/Brandon/javascript/lab01-03/lab01 lab04py/index.html new file mode 100644 index 00000000..b0f5960a --- /dev/null +++ b/code/Brandon/javascript/lab01-03/lab01 lab04py/index.html @@ -0,0 +1,13 @@ + + + + + + + Lab 04 + + +

Lab 04 Number to Text

+ + + \ No newline at end of file diff --git a/code/Brandon/javascript/lab01-03/lab01 lab04py/script.js b/code/Brandon/javascript/lab01-03/lab01 lab04py/script.js new file mode 100644 index 00000000..847b2840 --- /dev/null +++ b/code/Brandon/javascript/lab01-03/lab01 lab04py/script.js @@ -0,0 +1,76 @@ +// Version 1 + +var single_digit = { + 0: "", + 1: "one", + 2: "two", + 3: "three", + 4: "four", + 5: "five", + 6: "six", + 7: "seven", + 8: "eight", + 9: "nine", +}; + +var double_digit = { + 0: "ten", + 1: "eleven", + 2: "twelve", + 3: "thirteen", + 4: "fourteen", + 5: "fifteen", + 6: "sixteen", + 7: "seventeen", + 8: "eighteen", + 9: "nineteen", +}; + +var tens = { + 0: "", + 1: "eleven", + 2: "twenty", + 3: "thirty", + 4: "forty", + 5: "fifty", + 6: "sixty", + 7: "seventy", + 8: "eighty", + 9: "Ninety", +}; + +let x = prompt("Please enter a number 1-999 to convert: "); + +let tens_digit = Math.floor((x / 10) % 10); +let ones_digit = Math.floor(x % 10); +let hundreths = Math.floor(x / 100); + +if ((x >= 1) & (x <= 9)) { + console.log(single_digit[x]); +} +if ((x >= 10) & (x <= 19)) { + console.log(double_digit[x]); +} +if ((x >= 20) & (x <= 99)) { + console.log(tens[tens_digit], single_digit[ones_digit]); +} +if ( + (x >= 100) & + (x <= 999) & + (ones_digit != 0) & + (tens_digit != 1) & + (tens_digit != 0) +) { + console.log( + single_digit[hundreths], + "hundred and", + tens[tens_digit], + single_digit[ones_digit] + ); +} else if (ones_digit == 0) { + console.log(single_digit[hundreths], "hundred and", tens[tens_digit]); +} else if (tens_digit == 1) { + console.log(single_digit[hundreths], "hundred", tens[tens_digit]); +} else if (tens_digit == 0) { + console.log(single_digit[hundreths], "hundred and", single_digit[ones_digit]); +} diff --git a/code/Brandon/javascript/lab01-03/lab01 lab09py/index.html b/code/Brandon/javascript/lab01-03/lab01 lab09py/index.html new file mode 100644 index 00000000..69f12fd3 --- /dev/null +++ b/code/Brandon/javascript/lab01-03/lab01 lab09py/index.html @@ -0,0 +1,13 @@ + + + + + + + Peaks and Valleys + + + +

Peaks and Valleys

+ + \ No newline at end of file diff --git a/code/Brandon/javascript/lab01-03/lab01 lab09py/script.js b/code/Brandon/javascript/lab01-03/lab01 lab09py/script.js new file mode 100644 index 00000000..8cbfd927 --- /dev/null +++ b/code/Brandon/javascript/lab01-03/lab01 lab09py/script.js @@ -0,0 +1,41 @@ +// Version 1 +let data = [1, 2, 3, 4, 5, 6, 7, 6, 5, 4, 5, 6, 7, 8, 9, 8, 7, 6, 7, 8, 9]; + +function peaks() { + for (let i = 0; i < data.length; i++) { + var len = data.length; + let current = data[i]; + let previous = data[(i - 1) % len]; // + let next = data[(i + 1) % len]; + if ((current > next) & (current > previous)) console.log(data[i] + " peak"); + } +} + +function valleys() { + for (let i = 0; i < data.length; i++) { + var len = data.length; + let current = data[i]; + let previous = data[Math.floor((i - 1) % len)]; // + let next = data[Math.floor((i + 1) % len)]; + if ((current < next) & (current < previous)) + console.log(data[i] + "valley"); + } +} + +function peaks_and_valleys() { + for (let i = 0; i < data.length; i++) { + var len = data.length; + let current = data[i]; + let previous = data[Math.floor((i - 1) % len)]; // + let next = data[Math.floor((i + 1) % len)]; + if ((current > next) & (current > previous)) console.log(data[i] + " peak"); + + if ((current < next) & (current < previous)) + console.log(data[i] + "valley"); + } +} + +peaks(); +valleys(); +console.log("----------------------"); +peaks_and_valleys(); From 6aa7e9f56f01024034728240665c1b3a0768fcc3 Mon Sep 17 00:00:00 2001 From: Brandon Sarazin Date: Thu, 12 May 2022 15:26:03 -0400 Subject: [PATCH 2/4] lab 01 --- .../lab01-03/lab01 lab02py/index.html | 18 +- .../lab01-03/lab01 lab02py/script.js | 58 +++++-- .../lab01-03/lab01 lab04py/index.html | 9 +- .../lab01-03/lab01 lab04py/script.js | 156 +++++++++++++----- .../lab01-03/lab01 lab09py/index.html | 11 +- .../lab01-03/lab01 lab09py/script.js | 18 +- code/Brandon/lab04/lab04.py | 73 ++++---- 7 files changed, 241 insertions(+), 102 deletions(-) diff --git a/code/Brandon/javascript/lab01-03/lab01 lab02py/index.html b/code/Brandon/javascript/lab01-03/lab01 lab02py/index.html index 79fd02a8..24ef431c 100644 --- a/code/Brandon/javascript/lab01-03/lab01 lab02py/index.html +++ b/code/Brandon/javascript/lab01-03/lab01 lab02py/index.html @@ -1,12 +1,26 @@ - + Document + - +

Number Average

+ + + + +

Hi

+ + \ No newline at end of file diff --git a/code/Brandon/javascript/lab01-03/lab01 lab02py/script.js b/code/Brandon/javascript/lab01-03/lab01 lab02py/script.js index f233282a..8ff8a6f4 100644 --- a/code/Brandon/javascript/lab01-03/lab01 lab02py/script.js +++ b/code/Brandon/javascript/lab01-03/lab01 lab02py/script.js @@ -1,6 +1,6 @@ -// Version 1 -let numbers; -let sums = 0; +// // Version 1 +// let numbers; +// let sums = 0; // numbers = [5, 0, 8, 3, 4, 1, 6]; // sums = 0; @@ -13,19 +13,41 @@ let sums = 0; // Version 2 numbers = []; let total = 0; -while (true) { - let user_input = parseInt( - prompt("Add a number to the list. Hit cancel to calculate the average. ") - ); - if (isNaN(user_input)) { - for (let i = 0; i < numbers.length; i++) { - sums += numbers[i]; - } - total = sums / numbers.length; - console.log(numbers); - console.log(total); - break; +// while (true) { +// let user_input = parseInt( +// prompt("Add a number to the list. Hit cancel to calculate the average. ") +// ); +// if (isNaN(user_input)) { +// for (let i = 0; i < numbers.length; i++) { +// sums += numbers[i]; +// } +// total = sums / numbers.length; +// console.log(numbers); +// console.log(total); +// break; +// } +// numbers.push(user_input); +// console.log(numbers); +// } + +let input = document.querySelector("#user-input"); +const button1 = document.querySelector("#total"); +const output = document.querySelector("#output"); +const submit = document.querySelector("#submit"); +let p = document.querySelector("p"); + +let number_list = []; +let sums = 0; + +submit.onclick = function () { + number_list.push(input.value); + p.innerText = number_list; +}; + +button1.addEventListener("click", function () { + for (let i = 0; i < number_list.length; i++) { + sums += number_list[i]; } - numbers.push(user_input); - console.log(numbers); -} + total = sums / number_list.length; + p.innerText = `Your average is ${total}. `; +}); diff --git a/code/Brandon/javascript/lab01-03/lab01 lab04py/index.html b/code/Brandon/javascript/lab01-03/lab01 lab04py/index.html index b0f5960a..e3539eb9 100644 --- a/code/Brandon/javascript/lab01-03/lab01 lab04py/index.html +++ b/code/Brandon/javascript/lab01-03/lab01 lab04py/index.html @@ -1,5 +1,6 @@ + @@ -7,7 +8,11 @@ Lab 04 -

Lab 04 Number to Text

- +

Number Average

+ + + + +

Converted Number Here

\ No newline at end of file diff --git a/code/Brandon/javascript/lab01-03/lab01 lab04py/script.js b/code/Brandon/javascript/lab01-03/lab01 lab04py/script.js index 847b2840..65d4f039 100644 --- a/code/Brandon/javascript/lab01-03/lab01 lab04py/script.js +++ b/code/Brandon/javascript/lab01-03/lab01 lab04py/script.js @@ -1,6 +1,83 @@ -// Version 1 +// // Version 1 -var single_digit = { +// var single_digit = { +// 0: "", +// 1: "one", +// 2: "two", +// 3: "three", +// 4: "four", +// 5: "five", +// 6: "six", +// 7: "seven", +// 8: "eight", +// 9: "nine", +// }; + +// var double_digit = { +// 0: "ten", +// 1: "eleven", +// 2: "twelve", +// 3: "thirteen", +// 4: "fourteen", +// 5: "fifteen", +// 6: "sixteen", +// 7: "seventeen", +// 8: "eighteen", +// 9: "nineteen", +// }; + +// var tens = { +// 0: "", +// 1: "eleven", +// 2: "twenty", +// 3: "thirty", +// 4: "forty", +// 5: "fifty", +// 6: "sixty", +// 7: "seventy", +// 8: "eighty", +// 9: "Ninety", +// }; + +// let x = prompt("Please enter a number 1-999 to convert: "); + +// let tens_digit = Math.floor((x / 10) % 10); +// let ones_digit = Math.floor(x % 10); +// let hundreths = Math.floor(x / 100); + +// if ((x >= 1) & (x <= 9)) { +// console.log(single_digit[x]); +// } +// if ((x >= 10) & (x <= 19)) { +// console.log(double_digit[x]); +// } +// if ((x >= 20) & (x <= 99)) { +// console.log(tens[tens_digit], single_digit[ones_digit]); +// } +// if ( +// (x >= 100) & +// (x <= 999) & +// (ones_digit != 0) & +// (tens_digit != 1) & +// (tens_digit != 0) +// ) { +// console.log( +// single_digit[hundreths], +// "hundred and", +// tens[tens_digit], +// single_digit[ones_digit] +// ); +// } else if (ones_digit == 0) { +// console.log(single_digit[hundreths], "hundred and", tens[tens_digit]); +// } else if (tens_digit == 1) { +// console.log(single_digit[hundreths], "hundred", tens[tens_digit]); +// } else if (tens_digit == 0) { +// console.log(single_digit[hundreths], "hundred and", single_digit[ones_digit]); +// } + +// Version 2 + +const single_digit = { 0: "", 1: "one", 2: "two", @@ -13,7 +90,7 @@ var single_digit = { 9: "nine", }; -var double_digit = { +const double_digit = { 0: "ten", 1: "eleven", 2: "twelve", @@ -26,7 +103,7 @@ var double_digit = { 9: "nineteen", }; -var tens = { +const tens = { 0: "", 1: "eleven", 2: "twenty", @@ -39,38 +116,43 @@ var tens = { 9: "Ninety", }; -let x = prompt("Please enter a number 1-999 to convert: "); +const submit_numbers = document.querySelector("#submit_numbers"); +let x = document.querySelector("#user-input"); +let p = document.querySelector("p"); -let tens_digit = Math.floor((x / 10) % 10); -let ones_digit = Math.floor(x % 10); -let hundreths = Math.floor(x / 100); +// let x = prompt("Please enter a number 1-999 to convert: "); -if ((x >= 1) & (x <= 9)) { - console.log(single_digit[x]); -} -if ((x >= 10) & (x <= 19)) { - console.log(double_digit[x]); -} -if ((x >= 20) & (x <= 99)) { - console.log(tens[tens_digit], single_digit[ones_digit]); -} -if ( - (x >= 100) & - (x <= 999) & - (ones_digit != 0) & - (tens_digit != 1) & - (tens_digit != 0) -) { - console.log( - single_digit[hundreths], - "hundred and", - tens[tens_digit], - single_digit[ones_digit] - ); -} else if (ones_digit == 0) { - console.log(single_digit[hundreths], "hundred and", tens[tens_digit]); -} else if (tens_digit == 1) { - console.log(single_digit[hundreths], "hundred", tens[tens_digit]); -} else if (tens_digit == 0) { - console.log(single_digit[hundreths], "hundred and", single_digit[ones_digit]); -} +submit_numbers.addEventListener("click", function () { + let tens_digit = Math.floor((x.value / 10) % 10); + let ones_digit = Math.floor(x.value % 10); + let hundreths = Math.floor(x.value / 100); + if ((x.value >= 1) & (x.value <= 9)) { + p.innerText = single_digit[x.value]; + } + if ((x.value >= 10) & (x.value <= 19)) { + p.innerText.value = double_digit[x.value]; + } + if ((x.value >= 20) & (x.value <= 99)) { + p.innerText = tens[tens_digit] + " " + single_digit[ones_digit]; + } + if ( + (x.value >= 100) & + (x.value <= 999) & + (ones_digit != 0) & + (tens_digit != 1) & + (tens_digit != 0) + ) { + p.innerText = + single_digit[hundreths] + + " hundred and " + + tens[tens_digit] + + single_digit[ones_digit]; + } else if (ones_digit === 0) { + p.innerText = single_digit[hundreths] + " hundred and " + tens[tens_digit]; + } else if (tens_digit === 1) { + p.innerText = single_digit[hundreths] + " hundred" + tens[tens_digit]; + } else if (tens_digit === 0) { + p.innerText = + single_digit[hundreths] + " hundred and " + single_digit[ones_digit]; + } +}); diff --git a/code/Brandon/javascript/lab01-03/lab01 lab09py/index.html b/code/Brandon/javascript/lab01-03/lab01 lab09py/index.html index 69f12fd3..c477c6ba 100644 --- a/code/Brandon/javascript/lab01-03/lab01 lab09py/index.html +++ b/code/Brandon/javascript/lab01-03/lab01 lab09py/index.html @@ -4,10 +4,15 @@ - Peaks and Valleys + + Lab 09 Peaks and Valleys - -

Peaks and Valleys

+

Peaks and Valleys

+

+ + +

+ \ No newline at end of file diff --git a/code/Brandon/javascript/lab01-03/lab01 lab09py/script.js b/code/Brandon/javascript/lab01-03/lab01 lab09py/script.js index 8cbfd927..5effe861 100644 --- a/code/Brandon/javascript/lab01-03/lab01 lab09py/script.js +++ b/code/Brandon/javascript/lab01-03/lab01 lab09py/script.js @@ -18,7 +18,7 @@ function valleys() { let previous = data[Math.floor((i - 1) % len)]; // let next = data[Math.floor((i + 1) % len)]; if ((current < next) & (current < previous)) - console.log(data[i] + "valley"); + console.log(data[i] + "valley \x20;"); } } @@ -28,14 +28,24 @@ function peaks_and_valleys() { let current = data[i]; let previous = data[Math.floor((i - 1) % len)]; // let next = data[Math.floor((i + 1) % len)]; - if ((current > next) & (current > previous)) console.log(data[i] + " peak"); + if ((current > next) & (current > previous)) + display.innerText += data[i] + " peak \x0A"; if ((current < next) & (current < previous)) - console.log(data[i] + "valley"); + display.innerText += data[i] + " valley \x0A"; } } +let display = document.querySelector("#display"); +let p = document.querySelector("p"); +const submit = document.querySelector("#submit"); +p.innerText = data; +let x; peaks(); valleys(); console.log("----------------------"); -peaks_and_valleys(); +// peaks_and_valleys(); + +submit.addEventListener("click", function () { + peaks_and_valleys(); +}); diff --git a/code/Brandon/lab04/lab04.py b/code/Brandon/lab04/lab04.py index 9f670b53..9bdc302a 100644 --- a/code/Brandon/lab04/lab04.py +++ b/code/Brandon/lab04/lab04.py @@ -1,44 +1,44 @@ single_digit = { - 1 : 'one', - 2 : 'two', - 3 : 'three', - 4 : 'four', - 5 : 'five', - 6 : 'six', - 7 : 'seven', - 8 : 'eight', - 9 : 'nine', + 1: 'one', + 2: 'two', + 3: 'three', + 4: 'four', + 5: 'five', + 6: 'six', + 7: 'seven', + 8: 'eight', + 9: 'nine', } -double_digit = { - 10 : 'ten', - 11 : 'eleven', - 12 : 'twelve', - 13 : 'thirteen', - 14 : 'fourteen', - 15 : 'fifteen', - 16 : 'sixteen', - 17 : 'seventeen', - 18 : 'eighteen', - 19 : 'nineteen', - } +double_digit = { + 10: 'ten', + 11: 'eleven', + 12: 'twelve', + 13: 'thirteen', + 14: 'fourteen', + 15: 'fifteen', + 16: 'sixteen', + 17: 'seventeen', + 18: 'eighteen', + 19: 'nineteen', +} tens = { - 2 : 'twenty', - 3 : 'thirty', - 4 : 'forty', - 5 : 'fifty', - 6 : 'sixty', - 7 : 'seventy', - 8 : 'eighty', - 9 : 'Ninety' + 2: 'twenty', + 3: 'thirty', + 4: 'forty', + 5: 'fifty', + 6: 'sixty', + 7: 'seventy', + 8: 'eighty', + 9: 'Ninety' } user_input = int(input('Please enter a number 1-999 to convert: ')) x = user_input -if x >= 1 and x <=9: +if x >= 1 and x <= 9: print(single_digit[x]) if x >= 10 and x <= 19: @@ -46,13 +46,14 @@ if x >= 20 and x <= 99: tens_digit = x//10 - ones_digit = x%10 + ones_digit = x % 10 print(tens_digit) print(tens[tens_digit], single_digit[ones_digit]) if x >= 100 and x <= 999: - tens_digit = x//10 %10 - ones_digit = x%10 - hundreths = x//100 - - print(single_digit[hundreths],'hundred', tens[tens_digit], single_digit[ones_digit]) \ No newline at end of file + tens_digit = x//10 % 10 + ones_digit = x % 10 + hundreths = x//100 + + print(single_digit[hundreths], 'hundred', + tens[tens_digit], single_digit[ones_digit]) From a5c5092a9aa4d76eb709e8cc514459ad0befc6ab Mon Sep 17 00:00:00 2001 From: Brandon Sarazin Date: Mon, 16 May 2022 17:31:37 -0400 Subject: [PATCH 3/4] lab01 fixed errors and added part c --- .../lab01-03/lab01 lab04py partc/index.html | 119 ++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 code/Brandon/javascript/lab01-03/lab01 lab04py partc/index.html diff --git a/code/Brandon/javascript/lab01-03/lab01 lab04py partc/index.html b/code/Brandon/javascript/lab01-03/lab01 lab04py partc/index.html new file mode 100644 index 00000000..011b5afe --- /dev/null +++ b/code/Brandon/javascript/lab01-03/lab01 lab04py partc/index.html @@ -0,0 +1,119 @@ + + + + + + + Lab 04 C + + + + + +
+

Number Average

+

{{ message }}

+
+ + + +
+

{{ output }}

+
+ + + + \ No newline at end of file From aeb84b1af44befa2e7219edf8704f8702461726e Mon Sep 17 00:00:00 2001 From: Brandon Sarazin Date: Mon, 16 May 2022 17:57:27 -0400 Subject: [PATCH 4/4] fixed labs and added part c --- code/Brandon/javascript/lab01-03/lab01 lab02py/index.html | 2 +- code/Brandon/javascript/lab01-03/lab01 lab02py/script.js | 2 +- code/Brandon/javascript/lab01-03/lab01 lab04py/script.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/Brandon/javascript/lab01-03/lab01 lab02py/index.html b/code/Brandon/javascript/lab01-03/lab01 lab02py/index.html index 24ef431c..f27706d1 100644 --- a/code/Brandon/javascript/lab01-03/lab01 lab02py/index.html +++ b/code/Brandon/javascript/lab01-03/lab01 lab02py/index.html @@ -20,7 +20,7 @@

Number Average

Hi

- + \ No newline at end of file diff --git a/code/Brandon/javascript/lab01-03/lab01 lab02py/script.js b/code/Brandon/javascript/lab01-03/lab01 lab02py/script.js index 8ff8a6f4..5ce1b72c 100644 --- a/code/Brandon/javascript/lab01-03/lab01 lab02py/script.js +++ b/code/Brandon/javascript/lab01-03/lab01 lab02py/script.js @@ -46,7 +46,7 @@ submit.onclick = function () { button1.addEventListener("click", function () { for (let i = 0; i < number_list.length; i++) { - sums += number_list[i]; + sums += +number_list[i]; } total = sums / number_list.length; p.innerText = `Your average is ${total}. `; diff --git a/code/Brandon/javascript/lab01-03/lab01 lab04py/script.js b/code/Brandon/javascript/lab01-03/lab01 lab04py/script.js index 65d4f039..fe77bb6a 100644 --- a/code/Brandon/javascript/lab01-03/lab01 lab04py/script.js +++ b/code/Brandon/javascript/lab01-03/lab01 lab04py/script.js @@ -150,7 +150,7 @@ submit_numbers.addEventListener("click", function () { } else if (ones_digit === 0) { p.innerText = single_digit[hundreths] + " hundred and " + tens[tens_digit]; } else if (tens_digit === 1) { - p.innerText = single_digit[hundreths] + " hundred" + tens[tens_digit]; + p.innerText = single_digit[hundreths] + " hundred and " + tens[tens_digit]; } else if (tens_digit === 0) { p.innerText = single_digit[hundreths] + " hundred and " + single_digit[ones_digit];