Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zoisite - Valerie V. #78

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^24.8.0",
"babel-plugin-module-resolver": "^3.2.0",
"eslint": "^8.41.0",
"eslint-plugin-jest": "^27.2.1",
"jest": "^24.8.0",
"regenerator-runtime": "^0.12.1"
},
Expand Down
67 changes: 63 additions & 4 deletions src/adagrams.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,74 @@
const LETTER_POOL = {A:9, B:2, C:2, D:4, E:12, F:2, G:3, H:2, I:9, J:1, K:1,
L:4, M:2, N:6, O:8, P:2, Q:1, R:6, S:4, T:6, U:4, V:2, W:2, X:1, Y:2, Z:1};

const SCORE_CHART = {A:1, B:3, C:3, D:2, E:1, F:4, G:2, H:4, I:1, J:8, K:5,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job using upper case snake case for your global constants!

L:1, M:3, N:1, O:1, P:3, Q:10, R:1, S:1, T:1, U:1, V:4, W:4, X:8, Y:4, Z:10};

export const drawLetters = () => {
// Implement this method for wave 1
const weightedPool = [];

for (let [key, value] of Object.entries(LETTER_POOL)) {
weightedPool.push(...Array(value).fill(key));

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love this method of creating the weighted pool of letters! It's sleek and looks good!

}

const hand = [];

while (hand.length < 10) {
const letterIndex = Math.floor(Math.random() * weightedPool.length);
hand.push(weightedPool[letterIndex]);
weightedPool.splice(letterIndex, 1);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great use of splice here!

}
return hand;
};

export const usesAvailableLetters = (input, lettersInHand) => {
// Implement this method for wave 2
const handCopy = [...lettersInHand];

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea to use the spread operator to make a shallow copy!


for (let i = 0; i < input.length; i++) {
if (handCopy.includes(input[i])) {
handCopy.shift();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The shift method will always remove the first value from the list, so I don't think it's the best option for this particular method. I would say a splice method would be a better choice in this case!

} else {
return false;
}
}
return true;
};

export const scoreWord = (word) => {
// Implement this method for wave 3
let score = 0;
for (let char of word.toUpperCase()) {
if (char in SCORE_CHART) score += SCORE_CHART[char];
}
if (word.length >= 7) score += 8;

return score;
};

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great! No notes!


export const highestScoreFrom = (words) => {
// Implement this method for wave 4
let highestScore = 0;
let topPlayers;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we are returning an object at the end, we could make this an object to begin with!


for (let word of words) {
let wordScore = scoreWord(word);
if (wordScore > highestScore) {
highestScore = wordScore;
topPlayers = [{word: word, score: wordScore}];
}
else if (wordScore == topPlayers[0]['score']) {
topPlayers.push({word: word, score: wordScore});
}
}

let winner = topPlayers[0]
for (let player of topPlayers) {
if (player['word'].length == 10) {
winner = player;
return winner;
}
if (player['word'].length < winner['word'].length) {
winner = player;
}
}
return winner;
};

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good! Well done, Valerie!


8 changes: 5 additions & 3 deletions test/adagrams.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ describe("Adagrams", () => {
});

it("returns a score of 0 if given an empty input", () => {
throw "Complete test";
expectScores({
"": 0,
});
});

it("adds an extra 8 points if word is 7 or more characters long", () => {
Expand All @@ -133,7 +135,7 @@ describe("Adagrams", () => {
});
});

describe.skip("highestScoreFrom", () => {
describe("highestScoreFrom", () => {
it("returns a hash that contains the word and score of best word in an array", () => {
const words = ["X", "XX", "XXX", "XXXX"];
const correct = { word: "XXXX", score: scoreWord("XXXX") };
Expand All @@ -145,7 +147,7 @@ describe("Adagrams", () => {
const words = ["XXX", "XXXX", "X", "XX"];
const correct = { word: "XXXX", score: scoreWord("XXXX") };

throw "Complete test by adding an assertion";
expect(highestScoreFrom(words)).toEqual(correct);
});

describe("in case of tied score", () => {
Expand Down
Loading