diff --git a/Sprint-1/fix/median.js b/Sprint-1/fix/median.js index b22590bc6..abd692c1b 100644 --- a/Sprint-1/fix/median.js +++ b/Sprint-1/fix/median.js @@ -6,9 +6,30 @@ // or 'list' has mixed values (the function is expected to sort only numbers). function calculateMedian(list) { - const middleIndex = Math.floor(list.length / 2); - const median = list.splice(middleIndex, 1)[0]; - return median; + // Return null if input is not an array + if (!Array.isArray(list)) { + return null; + } + + // Filter out non-numeric values (keep only actual numbers) + const numbers = list.filter((item) => typeof item === "number"); + + // Return null if no valid numbers found + if (numbers.length === 0) { + return null; + } + + // Sort numbers in ascending order (create a copy to avoid mutation) + const sorted = [...numbers].sort((a, b) => a - b); + const middleIndex = Math.floor(sorted.length / 2); + + // For odd-length arrays: return middle element + // For even-length arrays: return average of two middle elements + if (sorted.length % 2 === 1) { + return sorted[middleIndex]; + } else { + return (sorted[middleIndex - 1] + sorted[middleIndex]) / 2; + } } module.exports = calculateMedian; diff --git a/Sprint-1/implement/dedupe.js b/Sprint-1/implement/dedupe.js index 781e8718a..ef4af83ef 100644 --- a/Sprint-1/implement/dedupe.js +++ b/Sprint-1/implement/dedupe.js @@ -1 +1,7 @@ -function dedupe() {} + +function dedupe(arr) { + return [...new Set(arr)]; +} + +module.exports = dedupe; + diff --git a/Sprint-1/implement/dedupe.test.js b/Sprint-1/implement/dedupe.test.js index 23e0f8638..0ad7b71e0 100644 --- a/Sprint-1/implement/dedupe.test.js +++ b/Sprint-1/implement/dedupe.test.js @@ -16,12 +16,22 @@ E.g. dedupe([1, 2, 1]) target output: [1, 2] // Given an empty array // When passed to the dedupe function // Then it should return an empty array -test.todo("given an empty array, it returns an empty array"); +test("given an empty array, it returns an empty array", () => { + expect(dedupe([])).toEqual([]); +}); // Given an array with no duplicates // When passed to the dedupe function // Then it should return a copy of the original array +test("given an array with no duplicates, it returns the same array", () => { + expect(dedupe([1, 2, 3])).toEqual([1, 2, 3]); + expect(dedupe(["a", "b", "c"])).toEqual(["a", "b", "c"]); +}); // Given an array with strings or numbers // When passed to the dedupe function // Then it should remove the duplicate values, preserving the first occurence of each element +test("given an array with duplicates, it removes the duplicates preserving the first occurrence", () => { + expect(dedupe(["a", "a", "b", "c", "b"])).toEqual(["a", "b", "c"]); + expect(dedupe([5, 1, 1, 2, 3, 2, 5, 8])).toEqual([5, 1, 2, 3, 8]); +}); diff --git a/Sprint-1/implement/max.js b/Sprint-1/implement/max.js index 6dd76378e..e0443510d 100644 --- a/Sprint-1/implement/max.js +++ b/Sprint-1/implement/max.js @@ -1,4 +1,16 @@ function findMax(elements) { + // Filter out non-numeric values and convert to numbers + const numbers = elements + .filter((item) => typeof item === "number") + .map(Number); + + // If no numbers found, return -Infinity + if (numbers.length === 0) { + return -Infinity; + } + + // Find the maximum number + return Math.max(...numbers); } module.exports = findMax; diff --git a/Sprint-1/implement/max.test.js b/Sprint-1/implement/max.test.js index 82f18fd88..b8c3eef08 100644 --- a/Sprint-1/implement/max.test.js +++ b/Sprint-1/implement/max.test.js @@ -12,32 +12,65 @@ We have set things up already so that this file can see your function from the o const findMax = require("./max.js"); -// Given an empty array -// When passed to the max function -// Then it should return -Infinity -// Delete this test.todo and replace it with a test. -test.todo("given an empty array, returns -Infinity"); - -// Given an array with one number -// When passed to the max function -// Then it should return that number - -// Given an array with both positive and negative numbers -// When passed to the max function -// Then it should return the largest number overall - -// Given an array with just negative numbers -// When passed to the max function -// Then it should return the closest one to zero - -// Given an array with decimal numbers -// When passed to the max function -// Then it should return the largest decimal number - -// Given an array with non-number values -// When passed to the max function -// Then it should return the max and ignore non-numeric values - -// Given an array with only non-number values -// When passed to the max function -// Then it should return the least surprising value given how it behaves for all other inputs +describe("findMax", () => { + // Given an empty array + // When passed to the max function + // Then it should return -infinity + test("given an empty array, returns -Infinity", () => { + expect(findMax([])).toBe(-Infinity); + }); + + // Given an array with one number + // When passed to the max function + // Then it should return that number + test("given an array with one number, returns that number", () => { + expect(findMax([5])).toBe(5); + expect(findMax([-10])).toBe(-10); + expect(findMax([0])).toBe(0); + }); + + // Given an array with both positive and negative numbers + // When passed to the max function + // Then it should return the largest number overall + test("given an array with both positive and negative numbers, returns the largest", () => { + expect(findMax([30, 50, 10, 40])).toBe(50); + expect(findMax([-5, -1, -10])).toBe(-1); + expect(findMax([10, -5, 20, -15])).toBe(20); + }); + + // Given an array with just negative numbers + // When passed to the max function + // Then it should return the closest one to zero + test("given an array with just negative numbers, returns the closest to zero", () => { + expect(findMax([-5, -1, -10])).toBe(-1); + expect(findMax([-100, -50, -25])).toBe(-25); + }); + + // Given an array with decimal numbers + // When passed to the max function + // Then it should return the largest decimal number + test("given an array with decimal numbers, returns the largest decimal", () => { + expect(findMax([1.5, 2.7, 1.2])).toBe(2.7); + expect(findMax([0.1, 0.01, 0.001])).toBe(0.1); + expect(findMax([-1.5, -2.7, -1.2])).toBe(-1.2); + }); + + // Given an array with non-number values + // When passed to the max function + // Then it should return the max and ignore non-numeric values + test("given an array with non-number values, ignores them and returns the max number", () => { + expect(findMax(["hey", 10, "hi", 60, 10])).toBe(60); + expect(findMax([30, "hello", 50, null, undefined, 40])).toBe(50); + expect(findMax([true, false, 25, 15])).toBe(25); + }); + + // Given an array with only non-number values + // When passed to the max function + // Then it should return the least surprising value given how it behaves for all other inputs + test("given an array with only non-number values, returns -Infinity", () => { + expect(findMax(["hello", "world"])).toBe(-Infinity); + expect(findMax([null, undefined])).toBe(-Infinity); + expect(findMax([true, false])).toBe(-Infinity); + expect(findMax([{}, []])).toBe(-Infinity); + }); +}); \ No newline at end of file diff --git a/Sprint-1/implement/sum.js b/Sprint-1/implement/sum.js index 9062aafe3..ebc81d453 100644 --- a/Sprint-1/implement/sum.js +++ b/Sprint-1/implement/sum.js @@ -1,4 +1,11 @@ function sum(elements) { + // Filter out non-numeric values and convert to numbers + const numbers = elements + .filter((item) => typeof item === "number") + .map(Number); + + // Sum all numbers using reduce + return numbers.reduce((total, num) => total + num, 0); } module.exports = sum; diff --git a/Sprint-1/implement/sum.test.js b/Sprint-1/implement/sum.test.js index dd0a090ca..420585c16 100644 --- a/Sprint-1/implement/sum.test.js +++ b/Sprint-1/implement/sum.test.js @@ -8,29 +8,61 @@ E.g. sum(['hey', 10, 'hi', 60, 10]), target output: 80 (ignore any non-numerical const sum = require("./sum.js"); -// Acceptance Criteria: +describe("sum", () => { + // Given an empty array + // When passed to the sum function + // Then it should return 0 + test("given an empty array, returns 0", () => { + expect(sum([])).toBe(0); + }); -// Given an empty array -// When passed to the sum function -// Then it should return 0 -test.todo("given an empty array, returns 0") + // Given an array with just one number + // When passed to the sum function + // Then it should return that number + test("given an array with just one number, returns that number", () => { + expect(sum([5])).toBe(5); + expect(sum([-10])).toBe(-10); + expect(sum([0])).toBe(0); + }); -// Given an array with just one number -// When passed to the sum function -// Then it should return that number + // Given an array containing negative numbers + // When passed to the sum function + // Then it should still return the correct total sum + test("given an array containing negative numbers, returns correct sum", () => { + expect(sum([10, -5, 3])).toBe(8); + expect(sum([-1, -2, -3])).toBe(-6); + expect(sum([-10, 20, -5])).toBe(5); + }); -// Given an array containing negative numbers -// When passed to the sum function -// Then it should still return the correct total sum + // Given an array with decimal(float numbers) + // When passed to the sum function + // Then it should return the correct total sum + test("given an array with decimal numbers, returns correct sum", () => { + expect(sum([1.5, 2.5, 1.0])).toBe(5); + expect(sum([0.1, 0.2, 0.3])).toBeCloseTo(0.6); + expect(sum([-1.5, 2.5, -1.0])).toBe(0); + }); -// Given an array with decimal/float numbers -// When passed to the sum function -// Then it should return the correct total sum + // Given an array containing non-number values + // When passed to the sum function + // Then it should ignore the non-numerical values and return the sum of the numerical elements + test("given an array with non-number values, ignores them and returns sum of numbers", () => { + expect(sum(["hey", 10, "hi", 60, 10])).toBe(80); + expect(sum([30, "hello", 50, null, undefined, 40])).toBe(120); + expect(sum([true, false, 25, 15])).toBe(40); + expect(sum([10, "20", 30])).toBe(40); // '20' is string, not number + }); -// Given an array containing non-number values -// When passed to the sum function -// Then it should ignore the non-numerical values and return the sum of the numerical elements + // Additional test cases + test("given an array with only non-number values, returns 0", () => { + expect(sum(["hello", "world"])).toBe(0); + expect(sum([null, undefined])).toBe(0); + expect(sum([true, false])).toBe(0); + expect(sum([{}, []])).toBe(0); + }); -// Given an array with only non-number values -// When passed to the sum function -// Then it should return the least surprising value given how it behaves for all other inputs + test("given example from requirements", () => { + expect(sum([10, 20, 30])).toBe(60); + expect(sum(["hey", 10, "hi", 60, 10])).toBe(80); + }); +}); \ No newline at end of file diff --git a/Sprint-1/refactor/includes.js b/Sprint-1/refactor/includes.js index 29dad81f0..977c47a4a 100644 --- a/Sprint-1/refactor/includes.js +++ b/Sprint-1/refactor/includes.js @@ -1,13 +1,13 @@ // Refactor the implementation of includes to use a for...of loop function includes(list, target) { - for (let index = 0; index < list.length; index++) { - const element = list[index]; + for (const element of list) { if (element === target) { return true; } } return false; + } module.exports = includes;