diff --git a/Sprint-1/fix/median.js b/Sprint-1/fix/median.js index b22590bc6..11f4ef59f 100644 --- a/Sprint-1/fix/median.js +++ b/Sprint-1/fix/median.js @@ -6,9 +6,52 @@ // 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 immediately if the input is not an array + if (!Array.isArray(list)) { + return null; + } + +<<<<<<< HEAD + // Keep only real numeric values + const numbersOnly = list.filter( + (item) => typeof item === "number" && !Number.isNaN(item) + ); + + // Return null if the array contains no numbers +======= + // filter() returns a new array, so this does not modify the original input + const numbersOnly = list.filter((item) => Number.isFinite(item)); + + // Return null if there are no numeric values +>>>>>>> a22ed15 (Address mentor feedback for sprint 1 data groups) + if (numbersOnly.length === 0) { + return null; + } + +<<<<<<< HEAD + // Create a sorted copy so the original input is not changed + const sortedNumbers = [...numbersOnly].sort((a, b) => a - b); + + const middleIndex = Math.floor(sortedNumbers.length / 2); + + // For an even-length array, median is the average of the two middle values +======= + // Safe to sort directly because numbersOnly is already a new array + const sortedNumbers = numbersOnly.sort((a, b) => a - b); + const middleIndex = Math.floor(sortedNumbers.length / 2); + + // Even number of values: return the average of the two middle values +>>>>>>> a22ed15 (Address mentor feedback for sprint 1 data groups) + if (sortedNumbers.length % 2 === 0) { + return (sortedNumbers[middleIndex - 1] + sortedNumbers[middleIndex]) / 2; + } + +<<<<<<< HEAD + // For an odd-length array, median is the middle value +======= + // Odd number of values: return the middle value +>>>>>>> a22ed15 (Address mentor feedback for sprint 1 data groups) + return sortedNumbers[middleIndex]; } module.exports = calculateMedian; diff --git a/Sprint-1/implement/dedupe.js b/Sprint-1/implement/dedupe.js index 781e8718a..f8494b4a5 100644 --- a/Sprint-1/implement/dedupe.js +++ b/Sprint-1/implement/dedupe.js @@ -1 +1,17 @@ -function dedupe() {} +// Return a new array with duplicate values removed. +// Keep the first occurrence of each value. + +function dedupe(elements) { + const uniqueElements = []; + + for (const element of elements) { + // Add the element only if it is not already in the result array + if (!uniqueElements.includes(element)) { + uniqueElements.push(element); + } + } + + return uniqueElements; +} + +module.exports = dedupe; diff --git a/Sprint-1/implement/dedupe.test.js b/Sprint-1/implement/dedupe.test.js index 23e0f8638..a1cc9b404 100644 --- a/Sprint-1/implement/dedupe.test.js +++ b/Sprint-1/implement/dedupe.test.js @@ -2,7 +2,11 @@ const dedupe = require("./dedupe.js"); /* Dedupe Array -📖 Dedupe means **deduplicate** +<<<<<<< HEAD +📖 Dedupe means deduplicate +======= + Dedupe means deduplicate +>>>>>>> a22ed15 (Address mentor feedback for sprint 1 data groups) In this kata, you will need to deduplicate the elements of an array @@ -16,12 +20,37 @@ 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 +<<<<<<< HEAD +test("given an array with no duplicates, it returns the same values", () => { + expect(dedupe([1, 2, 3])).toEqual([1, 2, 3]); +======= +test("given an array with no duplicates, it returns a copy of the original array", () => { + const input = [1, 2, 3]; + const result = dedupe(input); + + expect(result).toEqual(input); + expect(result).not.toBe(input); +>>>>>>> a22ed15 (Address mentor feedback for sprint 1 data groups) +}); // 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 duplicate strings, removes duplicates and preserves first occurrence", () => { + expect(dedupe(["a", "a", "a", "b", "b", "c"])).toEqual(["a", "b", "c"]); +}); + +test("given an array with duplicate numbers, removes duplicates and preserves first occurrence", () => { + expect(dedupe([5, 1, 1, 2, 3, 2, 5, 8])).toEqual([5, 1, 2, 3, 8]); +}); + +test("given a mixed duplicate order, removes duplicates and preserves first occurrence", () => { + expect(dedupe([1, 2, 1])).toEqual([1, 2]); +}); diff --git a/Sprint-1/implement/max.js b/Sprint-1/implement/max.js index 6dd76378e..3e0d7fdc5 100644 --- a/Sprint-1/implement/max.js +++ b/Sprint-1/implement/max.js @@ -1,4 +1,24 @@ +// Find the largest numerical value in an array. +// Non-number values should be ignored. + function findMax(elements) { + let maxValue = -Infinity; + + for (const element of elements) { +<<<<<<< HEAD + // Only compare values that are real numbers + if (typeof element === "number" && !Number.isNaN(element)) { + if (element > maxValue) { + maxValue = element; + } +======= + if (Number.isFinite(element) && element > maxValue) { + maxValue = element; +>>>>>>> a22ed15 (Address mentor feedback for sprint 1 data groups) + } + } + + return maxValue; } module.exports = findMax; diff --git a/Sprint-1/implement/max.test.js b/Sprint-1/implement/max.test.js index 82f18fd88..0b586673f 100644 --- a/Sprint-1/implement/max.test.js +++ b/Sprint-1/implement/max.test.js @@ -15,29 +15,52 @@ 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"); +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([42])).toBe(42); +}); // 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 positive and negative numbers, returns the largest number", () => { + expect(findMax([-10, 3, 25, -1])).toBe(25); +}); // 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 only negative numbers, returns the largest one", () => { + expect(findMax([-9, -2, -15, -4])).toBe(-2); +}); // 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.2, 3.8, 2.4])).toBe(3.8); +}); // 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", () => { +<<<<<<< HEAD + expect(findMax(["hey", 10, "hi", 60, 10])).toBe(60); +======= + expect(findMax(["hey", 10, "300", "hi", 60, 10])).toBe(60); +>>>>>>> a22ed15 (Address mentor feedback for sprint 1 data groups) +}); // 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(["apple", null, undefined, "banana"])).toBe(-Infinity); +}); diff --git a/Sprint-1/implement/sum.js b/Sprint-1/implement/sum.js index 9062aafe3..806e3fbe3 100644 --- a/Sprint-1/implement/sum.js +++ b/Sprint-1/implement/sum.js @@ -1,4 +1,21 @@ +// Sum the numerical values in an array. +// Non-number values should be ignored. + function sum(elements) { + let total = 0; + + for (const element of elements) { +<<<<<<< HEAD + // Only add values that are real numbers + if (typeof element === "number" && !Number.isNaN(element)) { +======= + if (Number.isFinite(element)) { +>>>>>>> a22ed15 (Address mentor feedback for sprint 1 data groups) + total += element; + } + } + + return total; } module.exports = sum; diff --git a/Sprint-1/implement/sum.test.js b/Sprint-1/implement/sum.test.js index dd0a090ca..f87cbf953 100644 --- a/Sprint-1/implement/sum.test.js +++ b/Sprint-1/implement/sum.test.js @@ -13,24 +13,45 @@ const sum = require("./sum.js"); // Given an empty array // When passed to the sum function // Then it should return 0 -test.todo("given an empty array, returns 0") +test("given an empty array, returns 0", () => { + expect(sum([])).toBe(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 one number, returns that number", () => { + expect(sum([7])).toBe(7); +}); // 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 with negative numbers, returns the correct sum", () => { + expect(sum([-5, 10, -2])).toBe(3); +}); // 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 the correct sum", () => { +<<<<<<< HEAD + expect(sum([1.5, 2.5, 3])).toBe(7); +======= + expect(sum([1.2, 0.6, 0.005])).toBeCloseTo(1.805, 10); +>>>>>>> a22ed15 (Address mentor feedback for sprint 1 data groups) +}); // 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 sums only numbers", () => { + expect(sum(["hey", 10, "hi", 60, 10])).toBe(80); +}); // 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 an array with only non-number values, returns 0", () => { + expect(sum(["apple", null, undefined, "banana"])).toBe(0); +}); diff --git a/Sprint-1/refactor/includes.js b/Sprint-1/refactor/includes.js index 29dad81f0..145603948 100644 --- a/Sprint-1/refactor/includes.js +++ b/Sprint-1/refactor/includes.js @@ -1,12 +1,15 @@ // 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]; + // Loop through each element in the list using a for...of loop + for (const element of list) { + // If the current element matches the target, return true if (element === target) { return true; } } + + // If the loop finishes without finding the target, return false return false; }