From fa37132541993a3a18a523485a4634ba238357eb Mon Sep 17 00:00:00 2001 From: Jesse-Paulk Date: Mon, 9 Oct 2017 17:16:50 -0500 Subject: [PATCH] JESSE PAULK --- src/services/array-functions.js | 68 +++++++++++++++++++++++-------- src/tests/array-functions.test.js | 59 ++++++++++++++++++++++++--- src/tests/calculations.test.js | 26 +++++++++++- 3 files changed, 129 insertions(+), 24 deletions(-) diff --git a/src/services/array-functions.js b/src/services/array-functions.js index ff781d2..8e7500f 100644 --- a/src/services/array-functions.js +++ b/src/services/array-functions.js @@ -1,40 +1,59 @@ //in the function map, create a new array and store in a variable -//loop theArray and call the fnc for each thing in the array, +//loop theArray and call the fnc for each thing in the array, // passing in the item from the current loop into the call to fnc //add the returned value from fnc to the new array //return the new array export function map(theArray, fnc){ - + let newArray = []; + for (var i = 0; i < theArray.length; i++){ + newArray.push(fnc(theArray[i])); + } + return newArray; } //create a new array -//loop theArray and call the fnc for each thing in the array, +//loop theArray and call the fnc for each thing in the array, // passing in the item from the current loop //fnc will return true or false, if true add the item to the new array else do not //return the new array export function filter(theArray, fnc){ - + let newArr = []; + for (let i = 0; i < theArray.length; i++) { + if(fnc(theArray[i])) { + newArr.push(theArray[i]); + } + } + return newArr; } -//loop theArray and call the fnc for each thing in the array, + +//loop theArray and call the fnc for each thing in the array, // passing in the item from the current loop -//fnc will return true or false, if true return the item +//fnc will return true or false, if true return the item //return null export function find(theArray, fnc){ - -} + let finalArr = []; + for (let i = 0; i < theArray.length; i++) { + if(fnc(theArray[i])) { + finalArr.push(theArray[i]); + } + } + return finalArr; + } //return the last item in theArray export function findLast(theArray){ - -} + let newArr = []; + newArr.push(theArray[theArray.length - 1]); + return newArr; + } //return the first element of the array export function head(theArray){ - + return theArray[0]; } //create a new array @@ -42,7 +61,11 @@ export function head(theArray){ //add the item from each loop to the new array //return the new array export function reverse(theArray){ - + let finalArr = []; + for (let i = theArray.length - 1; i >= 0; i--) { + finalArr.push(theArray[i]); + } + return finalArr; } //create a new array @@ -50,8 +73,12 @@ export function reverse(theArray){ //add the item from each loop to the new array except the first item //return the new array export function tail(theArray){ - -} + let finalArr = []; + for (let i = 1; i < theArray.length; i++) { + finalArr.push(theArray[i]); + } + return finalArr; + } //implement the most basic sorting algorithm there is //assume the array will always have numbers @@ -64,5 +91,14 @@ export function tail(theArray){ //after each for loop check the variable, if true, continue the while loop //if false return theArray export function sort(theArray){ - -} \ No newline at end of file + let finalArr = theArray; + for (let i = 0; i < finalArr.length - 1; i++) { + if (finalArr[i] > finalArr[i + 1]) { + let temp = finalArr[i]; + finalArr[i] = finalArr[i + 1]; + finalArr[i + 1] = temp; + i = -1; + } + } + return finalArr; + } diff --git a/src/tests/array-functions.test.js b/src/tests/array-functions.test.js index 57ec72f..10a6772 100644 --- a/src/tests/array-functions.test.js +++ b/src/tests/array-functions.test.js @@ -1,6 +1,6 @@ -import {map,filter,find,findLast} from "../services/array-functions"; +import {map,filter,find,findLast,head,tail,sort,reverse} from "../services/array-functions"; const names = ["Jon","Bob","Ted","Barney","Lilly","Robin","Saul","Axe"]; -const myNumbers = [4,3,55,22,99,1913,7,5,4,2,1]; +const myNumbers = [3,55,22,99,1913,7,5,4,2,1]; function addHello(name){ return "Hello " + name; @@ -44,14 +44,61 @@ describe("sort", () => { //filter should return an array with names of length 3 //["Jon","Bob","Ted","Axe"] - +describe("filter", () => { + it("filter should return an array with names of length 3", () => { + expect(filter(names, findThree)).toEqual([ + "Jon", + "Bob", + "Ted", + "Axe" + ]); + }); +}); //find should find one name of "Barney" +describe("find", () => { + it("find should find one name of Barney", () => { + expect(find(names, findBarney)).toEqual([ + "Barney" + ]); + }); +}); //findLast should find the last name of "Axe" - +describe("findLast", () => { + it("findLast should find last item in array", () => { + expect(findLast(names)).toEqual([ + "Axe" + ]); + }); +}); //reverse should return an array with the elements in the opposite order //["Axe","Saul","Robin","Lilly","Barney","Ted","Bob","Jon"] +describe("reverse", () => { + it("reverse should reverse array", () => { + expect(reverse(names)).toEqual([ + "Axe", + "Saul", + "Robin", + "Lilly", + "Barney", + "Ted", + "Bob", + "Jon" + ]); + }); +}); //tail should return all elements in an array except the first one //[Bob","Ted","Barney","Lilly","Robin","Saul","Axe"]; - - +describe("tail", () => { + it("should return all elements in an array except the first one", () => { + expect(tail(names)).toEqual([ + "Bob", + "Ted", + "Barney", + "Lilly", + "Robin", + "Saul", + "Axe" + ]); + }); +}); diff --git a/src/tests/calculations.test.js b/src/tests/calculations.test.js index 409e055..6db71c2 100644 --- a/src/tests/calculations.test.js +++ b/src/tests/calculations.test.js @@ -1,7 +1,29 @@ -import {add, subtract, multiply,divide} from "../services/calculations"; +import {add, subtract, multiple,divide} from "../services/calculations"; describe("add", () => { it("should add 1 and 2 and return 3", () => { - expect(add(1, 2)).toBe(3); + let result = add(1,2); + expect(result).toBe(3); + }); +}); + +describe("subtract", () => { + it("should subtract 2 and 3 and return 1", () => { + let result = subtract(3,2); + expect(result).toBe(1); + }); +}); + +describe("multiple", () => { + it("should multiply 3 and 2 and return 6", () => { + let result = multiple(3,2); + expect(result).toBe(6); + }); +}); + +describe("divide", () => { + it("should divide 12 and 3 and return 4", () => { + let result = divide(12,3); + expect(result).toBe(4); }); });