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

Amethyst-C19-Kaliane-Van-JS-Adagrams #55

Open
wants to merge 2 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
92 changes: 87 additions & 5 deletions src/adagrams.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,97 @@
// WAVE 1
export const drawLetters = () => {
// Implement this method for wave 1
const letterPool = {
'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
};
Comment on lines 2 to +9

Choose a reason for hiding this comment

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

Hi Kaliane! Great job completing JS Adagrams! Congrats on finishing your first JavaScript project 🎉 Excellent choice with this data structure, I just want to mention that in JavaScript our keys don't need to be strings. Because of the popularity of JSON, it is frequent to see the keys of object literals as quoted strings. The quotes are required in order to be valid JSON, but they are not required in order to be valid JavaScript. Keys in object literals can be expressed in any of the following three ways:

const letterValue = {  
  A: 9,      // No quotes at all  
  'A': 9,    // Single-quoted string  
  "A": 9  // Double-quoted string
};


let letters = [];
for (let letter in letterPool) {
for (let i = 0; i < letterPool[letter]; i++) {
letters.push(letter);
}
}

let hand = [];
for (let i = 0; i < 10; i++) {
let randomIndex = Math.floor(Math.random() * letters.length);
Comment on lines +11 to +20

Choose a reason for hiding this comment

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

Great work getting comfortable with JavaScript's syntax. It looks like you're getting use to looping over data and adding conditional logic ✅

hand.push(letters[randomIndex]);
letters.splice(randomIndex, 1);
}

return hand;
};

// WAVE 2
export const usesAvailableLetters = (input, lettersInHand) => {
// Implement this method for wave 2
let lettersInHandCopy = [...lettersInHand];
for (let letter of input) {
if (!lettersInHandCopy.includes(letter)) {
return false;
} else {
let index = lettersInHandCopy.indexOf(letter);
lettersInHandCopy.splice(index, 1);
}
Comment on lines 29 to +37

Choose a reason for hiding this comment

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

Nice work!

}

return true;
};

// WAVE 3
export const scoreWord = (word) => {
// Implement this method for wave 3
if (word.length === 0) {
return 0;
}

const letterScores = {
A: 1, E: 1, I: 1, O: 1, U: 1, L: 1, N: 1, R: 1, S: 1, T: 1, D: 2,
G: 2,
B: 3, C: 3, M: 3, P: 3,
F: 4, H: 4, V: 4, W: 4, Y: 4,
K: 5,
J: 8, X: 8,
Q: 10, Z: 10
};

let score = 0;

for (let letter of word.toUpperCase()) {
score += letterScores[letter];
}

if (word.length >= 7) {
score += 8;
}

Comment on lines +59 to +68

Choose a reason for hiding this comment

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

Nice job translating this logic 👍🏾

return score;
};


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

for (let word of words) {
let score = scoreWord(word);

if (score > highestScore) {
highestScore = score;
highestScoringWord = word;
} else if (score === highestScore) {
if (word.length === 10 && highestScoringWord.length !== 10) {
highestScoringWord = word;
} else if (word.length < highestScoringWord.length && highestScoringWord.length !== 10) {
highestScoringWord = word;
}
Comment on lines +81 to +89

Choose a reason for hiding this comment

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

Great work with these variable names!

}
}

return {
word: highestScoringWord,
score: highestScore
};
};
24 changes: 20 additions & 4 deletions test/adagrams.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,12 @@ describe("Adagrams", () => {
});

it("returns a score of 0 if given an empty input", () => {
throw "Complete test";
const word = '';
const correct = 0;

const result = scoreWord(word);

expect(result).toBe(correct);
});

it("adds an extra 8 points if word is 7 or more characters long", () => {
Expand All @@ -133,7 +138,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 @@ -144,10 +149,21 @@ describe("Adagrams", () => {
it("accurately finds best scoring word even if not sorted", () => {
const words = ["XXX", "XXXX", "X", "XX"];
const correct = { word: "XXXX", score: scoreWord("XXXX") };

throw "Complete test by adding an assertion";
const result = highestScoreFrom(words);

expect(result).toEqual(correct);
});

it("accurately finds best scoring word even if not sorted", () => {
const words = ["XXX", "XXXX", "X", "XX"];
const correct = { word: "XXXX", score: scoreWord("XXXX") };

const result = highestScoreFrom(words);

expect(result).toEqual(correct);
});


describe("in case of tied score", () => {
const expectTie = (words) => {
const scores = words.map((word) => scoreWord(word));
Expand Down
2 changes: 1 addition & 1 deletion test/demo/model.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Model from 'demo/model';
import Adagrams from 'demo/adagrams';

describe.skip('Game Model', () => {
describe('Game Model', () => {
const config = {
players: [
'Player A',
Expand Down