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- Stacy #75

Open
wants to merge 6 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
89 changes: 84 additions & 5 deletions src/adagrams.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,94 @@
export const drawLetters = () => {
// Implement this method for wave 1
var letters = {

Choose a reason for hiding this comment

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

I'm sure you know this now but we want to avoid using var, I think here we could use const instead.

'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
};
let pieces = [];
let count = 98;

for(let i = 0; i < 10; i++){
let randPiece = Math.floor(Math.random() * count+1);
let key = weighted(letters, randPiece);
pieces.push(key);

letters[key] -=1;
if (letters[key] == 0){
delete letters[key];
}
count -= 1;
}
return pieces;
};

const weighted = (dict, randomPiece) => {
for (let [key, value] of Object.entries(dict)){
randomPiece -= value;
if (randomPiece <= 0){
return key;
}
}
Comment on lines +25 to +31

Choose a reason for hiding this comment

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

Love this function! For readability we want to make sure we are placing our function definitions above the calls.

};

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

Choose a reason for hiding this comment

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

We could make a new letter bank with the Javascript spread syntax like so newLetterBank = [...lettersInHand]

for(const letter of lettersInHand){
newLetterBank.push(letter);
}
for(const letter of input){
if(newLetterBank.includes(letter)){
newLetterBank.splice(newLetterBank.indexOf(letter), 1);
} else{
return false;
}
}
return true;
};

export const scoreWord = (word) => {
// Implement this method for wave 3
const values = {'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 sum = 0;
if (word.length == 0){
return 0;
}
if(word.length >= 7){
sum += 8;
}
for(const letter of word){
if(values[letter.toUpperCase()]){
sum += values[letter.toUpperCase()];
}
}
return sum;

Choose a reason for hiding this comment

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

⭐️

};

export const highestScoreFrom = (words) => {
// Implement this method for wave 4
};
let maxVal = 0;
let tempScore = 0;
let maxWord = "";
Comment on lines +74 to +76

Choose a reason for hiding this comment

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

If we know we want to return these variables in object form, could just initialize said object here?


for(const word of words){
tempScore = scoreWord(word)
if(maxVal < tempScore){
maxVal = tempScore;
maxWord = word;
}
else if(maxVal == tempScore){

Choose a reason for hiding this comment

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

Love the if statements in this function, they are very concise!

if(word.length == 10 && maxWord.length != 10){
maxWord = word;
}
else if(word.length < maxWord.length && maxWord.length != 10){
maxWord = word;
}
}
};
return {"word": maxWord, "score": maxVal};

Choose a reason for hiding this comment

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

Nice job, Stacy! As you probably noticed, I didn't give too much feedback due to the scope of the project (Translating your python code to Javascript code). I tried to just point out any glaring issues, if any. With that being said, if you want to discuss anything in greater detail, feel free to reach out to me!

};
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