From ef740e49ba07a9ff2a81a7d1618f7aac7b67e215 Mon Sep 17 00:00:00 2001 From: jess2896 Date: Thu, 26 Sep 2019 11:22:26 -0400 Subject: [PATCH 1/4] Calculates which team has the highest average score --- index.html | 4 +++- script.js | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 script.js diff --git a/index.html b/index.html index 975ef26..03fd62a 100644 --- a/index.html +++ b/index.html @@ -8,4 +8,6 @@

Section 2: JavaScript Language Basics

- \ No newline at end of file + + + diff --git a/script.js b/script.js new file mode 100644 index 0000000..09c607e --- /dev/null +++ b/script.js @@ -0,0 +1,36 @@ +let johnTeamScores=[89,20,103]; +let mikeTeamScores=[116,94,123]; + +function calcAverage(scores){ + let sum=0; + for(let i=0;imikesAvrg? "John's team has a higher average of "+johnsAvrg: "Mike's team has a higher average of "+mikesAvrg; +let avrg = johnsAvrg == mikesAvrg? "John's and Mike's teams have the same average score": hasHigherScore; + +//Extra + +let maryTeamScores=[97,134,105]; +let maryAvrg = calcAverage(maryTeamScores); +let winner="The three teams are tied"; + +if(maryAvrg>johnsAvrg && maryAvrg>mikesAvrg){ + winner= "Mary's team has the highest average score of "+maryAvrg; +} +else if(maryAvrg!==johnsAvrg && maryAvrg!==mikesAvrg){ + winner=avrg; +} +else if(maryAvrg>johnsAvrg && maryAvrg==mikesAvrg){ + winner = "Mary's and Mike's teams have the highest score"; +} +else if(maryAvrg>mikesAvrg && maryAvrg==johnsAvrg){ + winner = "Mary's and John's teams have the highest score"; +} + +console.log(winner); From 9ab399ebc3206c521cbf2a1a8cc722ec544632d4 Mon Sep 17 00:00:00 2001 From: jess2896 Date: Mon, 30 Sep 2019 11:15:26 -0400 Subject: [PATCH 2/4] Fixed the code's format --- script.js | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/script.js b/script.js index 09c607e..658948f 100644 --- a/script.js +++ b/script.js @@ -1,35 +1,34 @@ -let johnTeamScores=[89,20,103]; -let mikeTeamScores=[116,94,123]; +let johnTeamScores = [89,20,103]; +let mikeTeamScores = [116,94,123]; +let johnsAvrg = calcAverage(johnTeamScores); +let mikesAvrg = calcAverage(mikeTeamScores); +let hasHigherScore = johnsAvrg > mikesAvrg? "John's team has a higher average of " + johnsAvrg : "Mike's team has a higher average of " + mikesAvrg; +let avrg = johnsAvrg == mikesAvrg? "John's and Mike's teams have the same average score" : hasHigherScore; -function calcAverage(scores){ - let sum=0; - for(let i=0;i { + sum += score; + }); return sum/scores.length; } -let johnsAvrg = calcAverage(johnTeamScores); -let mikesAvrg = calcAverage(mikeTeamScores); -let hasHigherScore = johnsAvrg>mikesAvrg? "John's team has a higher average of "+johnsAvrg: "Mike's team has a higher average of "+mikesAvrg; -let avrg = johnsAvrg == mikesAvrg? "John's and Mike's teams have the same average score": hasHigherScore; - //Extra -let maryTeamScores=[97,134,105]; +let maryTeamScores = [97,134,105]; let maryAvrg = calcAverage(maryTeamScores); -let winner="The three teams are tied"; +let winner = "The three teams are tied"; -if(maryAvrg>johnsAvrg && maryAvrg>mikesAvrg){ - winner= "Mary's team has the highest average score of "+maryAvrg; +if (maryAvrg > johnsAvrg && maryAvrg> mikesAvrg) { + winner = "Mary's team has the highest average score of " + maryAvrg; } -else if(maryAvrg!==johnsAvrg && maryAvrg!==mikesAvrg){ - winner=avrg; +else if (maryAvrg !== johnsAvrg && maryAvrg !== mikesAvrg) { + winner = avrg; } -else if(maryAvrg>johnsAvrg && maryAvrg==mikesAvrg){ +else if (maryAvrg > johnsAvrg && maryAvrg == mikesAvrg) { winner = "Mary's and Mike's teams have the highest score"; } -else if(maryAvrg>mikesAvrg && maryAvrg==johnsAvrg){ +else if (maryAvrg > mikesAvrg && maryAvrg == johnsAvrg) { winner = "Mary's and John's teams have the highest score"; } From 2c6052a0ef3a8a8737e935f619034e1f21bec63c Mon Sep 17 00:00:00 2001 From: jess2896 Date: Fri, 4 Oct 2019 11:29:49 -0400 Subject: [PATCH 3/4] Fixed spaces and the some variables declarations --- index.html | 2 +- script.js | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/index.html b/index.html index 03fd62a..9ce1522 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@

Section 2: JavaScript Language Basics

+ - diff --git a/script.js b/script.js index 658948f..580918a 100644 --- a/script.js +++ b/script.js @@ -1,25 +1,28 @@ -let johnTeamScores = [89,20,103]; -let mikeTeamScores = [116,94,123]; -let johnsAvrg = calcAverage(johnTeamScores); -let mikesAvrg = calcAverage(mikeTeamScores); -let hasHigherScore = johnsAvrg > mikesAvrg? "John's team has a higher average of " + johnsAvrg : "Mike's team has a higher average of " + mikesAvrg; -let avrg = johnsAvrg == mikesAvrg? "John's and Mike's teams have the same average score" : hasHigherScore; +const johnTeamScores = [89,20,103]; +const mikeTeamScores = [116,94,123]; +const johnsAvrg = calcAverage(johnTeamScores); +const mikesAvrg = calcAverage(mikeTeamScores); +const hasHigherScore = johnsAvrg > mikesAvrg ? "John's team has a higher average of " + johnsAvrg : "Mike's team has a higher average of " + mikesAvrg; +const avrg = johnsAvrg == mikesAvrg ? "John's and Mike's teams have the same average score" : hasHigherScore; function calcAverage(scores) { + let sum = 0; + scores.forEach(score => { sum += score; }); - return sum/scores.length; + + return sum / scores.length; } //Extra -let maryTeamScores = [97,134,105]; -let maryAvrg = calcAverage(maryTeamScores); +const maryTeamScores = [97,134,105]; +const maryAvrg = calcAverage(maryTeamScores); let winner = "The three teams are tied"; -if (maryAvrg > johnsAvrg && maryAvrg> mikesAvrg) { +if (maryAvrg > johnsAvrg && maryAvrg > mikesAvrg) { winner = "Mary's team has the highest average score of " + maryAvrg; } else if (maryAvrg !== johnsAvrg && maryAvrg !== mikesAvrg) { From f3be13a87eb96deff7b6f19d9eca73c9a226940d Mon Sep 17 00:00:00 2001 From: jess2896 Date: Fri, 11 Oct 2019 12:27:09 -0400 Subject: [PATCH 4/4] Fixed repeated string --- script.js | 63 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/script.js b/script.js index 580918a..f6b56da 100644 --- a/script.js +++ b/script.js @@ -1,10 +1,38 @@ -const johnTeamScores = [89,20,103]; -const mikeTeamScores = [116,94,123]; +const johnTeamScores = [89, 20, 103]; +const mikeTeamScores = [116, 94, 123]; const johnsAvrg = calcAverage(johnTeamScores); const mikesAvrg = calcAverage(mikeTeamScores); -const hasHigherScore = johnsAvrg > mikesAvrg ? "John's team has a higher average of " + johnsAvrg : "Mike's team has a higher average of " + mikesAvrg; -const avrg = johnsAvrg == mikesAvrg ? "John's and Mike's teams have the same average score" : hasHigherScore; +const higherAverage = { + winner: 'John and Mike', + score: '', + numberOfWinners: 1, + + setWinner() { + + if (johnsAvrg !== mikesAvrg && johnsAvrg > mikesAvrg) { + this.winner = 'John'; + this.score = johnsAvrg; + } + else if (johnsAvrg !== mikesAvrg) { + this.winner = 'Mike'; + this.score = mikesAvrg; + } + else { + this.numberOfWinners = 2; + } + } +}; + +/** + * Determines which team has the highest average score and stores the results + */ +higherAverage.setWinner(); + +/** + * Calculates the average of the given array of numbers + * @param {integers[]} scores + */ function calcAverage(scores) { let sum = 0; @@ -18,21 +46,30 @@ function calcAverage(scores) { //Extra -const maryTeamScores = [97,134,105]; +const maryTeamScores = [97, 134, 105]; const maryAvrg = calcAverage(maryTeamScores); -let winner = "The three teams are tied"; if (maryAvrg > johnsAvrg && maryAvrg > mikesAvrg) { - winner = "Mary's team has the highest average score of " + maryAvrg; -} -else if (maryAvrg !== johnsAvrg && maryAvrg !== mikesAvrg) { - winner = avrg; + higherAverage.winner = 'Mary'; + higherAverage.score = maryAvrg; + higherAverage.numberOfWinners = 1; } + else if (maryAvrg > johnsAvrg && maryAvrg == mikesAvrg) { - winner = "Mary's and Mike's teams have the highest score"; + higherAverage.winner = 'Mary and Mike'; + higherAverage.numberOfWinners = 2; } + else if (maryAvrg > mikesAvrg && maryAvrg == johnsAvrg) { - winner = "Mary's and John's teams have the highest score"; + higherAverage.winner = 'Mary and John'; + higherAverage.numberOfWinners = 2; } -console.log(winner); +else if (maryAvrg === mikesAvrg && maryAvrg === johnsAvrg) { + higherAverage.winner = 'Mary, John and Mike'; + higherAverage.numberOfWinners = 3; +} + +const highestScore = higherAverage.numberOfWinners === 1 ? `${higherAverage.winner}\'s team has the highest average score of ${higherAverage.score}` : `${higherAverage.winner} have the same score`; + +console.log(highestScore);