Skip to content

Commit e045f70

Browse files
committed
Some reworked functions
1 parent a9dd717 commit e045f70

File tree

1 file changed

+63
-8
lines changed

1 file changed

+63
-8
lines changed

starter-code/src/functions-and-arrays.js

Lines changed: 63 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
// Find the maximum
22

3+
/*
34
function maxOfTwoNumbers(num1, num2) {
45
if (num1 > num2) {
56
return num1;
67
} else {
78
return num2;
89
}
910
}
11+
*/
12+
13+
const maxOfTwoNumbers = (num1, num2) => num1> num2 ? num1 : num2
1014

1115
// Finding Longest Word
1216
var words = [
@@ -40,25 +44,39 @@ function findLongestWord(wordsArray) {
4044

4145
var numbers = [6, 12, 1, 18, 13, 16, 2, 1, 8, 10];
4246

47+
/*
4348
function sumArray(numsArray) {
4449
let result = 0;
4550
numsArray.forEach(function (number) {
4651
result += number;
4752
})
4853
return result;
4954
}
55+
*/
56+
57+
const sumArray = numsArray => {
58+
let result = 0;
59+
numsArray.forEach(function (number) {
60+
result += number;
61+
})
62+
return result;
63+
}
5064

5165
// Calculate the Average
5266

5367
var numbersAvg = [2, 6, 9, 10, 7, 4, 1, 9];
5468

69+
/*
5570
function averageNumbers(numsArray) {
5671
if (numsArray.length !== 0) {
5772
return sumArray(numsArray) / numsArray.length;
5873
} else {
5974
return null;
6075
}
6176
}
77+
*/
78+
79+
const averageNumbers = numsArray => (numsArray.length !== 0 ) ? ( sumArray(numsArray)/numsArray.length ) : null
6280

6381
// Array of Strings
6482
var wordsArr = [
@@ -74,13 +92,23 @@ var wordsArr = [
7492
'palace'
7593
];
7694

95+
/*
7796
function averageWordLength(wordsArray) {
7897
let arrayLengths = [];
7998
wordsArray.forEach(function (word) {
8099
arrayLengths.push(word.length);
81100
})
82101
return averageNumbers(arrayLengths);
83102
}
103+
*/
104+
105+
const averageWordLength = wordsArray => {
106+
let arrayLengths = [];
107+
wordsArray.forEach(function (word) {
108+
arrayLengths.push(word.length);
109+
})
110+
return averageNumbers(arrayLengths);
111+
}
84112

85113
// Unique Arrays
86114
var wordsUnique = [
@@ -97,6 +125,7 @@ var wordsUnique = [
97125
'bring'
98126
];
99127

128+
/*
100129
function uniquifyArray(wordsArray){
101130
let arrayResult = [];
102131
wordsArray.forEach(function (word) {
@@ -106,6 +135,16 @@ function uniquifyArray(wordsArray){
106135
})
107136
return arrayResult;
108137
}
138+
*/
139+
const uniquifyArray = wordsArray =>{
140+
let arrayResult = [];
141+
wordsArray.forEach(function (word) {
142+
if (arrayResult.indexOf(word) === -1) {
143+
arrayResult.push(word);
144+
}
145+
})
146+
return arrayResult;
147+
}
109148

110149
// Finding Elements
111150
var wordsFind = [
@@ -119,6 +158,7 @@ var wordsFind = [
119158
'disobedience'
120159
];
121160

161+
/*
122162
function doesWordExist(wordsArray, wordToFind) {
123163
let result = false;
124164
wordsArray.forEach(function (word) {
@@ -127,6 +167,17 @@ function doesWordExist(wordsArray, wordToFind) {
127167
}
128168
})
129169
return result;
170+
}
171+
*/
172+
173+
const doesWordExist = (wordsArray, wordToFind) => {
174+
let result = false;
175+
wordsArray.forEach(function (word) {
176+
if (wordToFind === word) {
177+
result = true;
178+
}
179+
})
180+
return result;
130181
}
131182

132183
// Counting Repetion
@@ -144,6 +195,7 @@ var wordsCount = [
144195
'matter'
145196
];
146197

198+
/*
147199
function howManyTimes(wordsArray, wordToSearch) {
148200
let result = 0;
149201
wordsArray.forEach(function (word) {
@@ -152,6 +204,17 @@ function howManyTimes(wordsArray, wordToSearch) {
152204
}
153205
})
154206
return result;
207+
}
208+
*/
209+
210+
const howManyTimes = (wordsArray, wordToSearch) => {
211+
let result = 0;
212+
wordsArray.forEach(function (word) {
213+
if (word === wordToSearch) {
214+
result++;
215+
}
216+
})
217+
return result;
155218
}
156219

157220
// Bonus Quest
@@ -179,14 +242,6 @@ var matrix = [
179242
[1, 70, 54, 71, 83, 51, 54, 69, 16, 92, 33, 48, 61, 43, 52, 1, 89, 19, 67, 48]
180243
];
181244

182-
/*
183-
function greatestProduct(matrix) {
184-
let result = 0;
185-
186-
return result;
187-
}
188-
*/
189-
190245
const greatestProduct = grid => {
191246
let maxProd = 0;
192247
for (let i = 0; i < grid.length; i++) {

0 commit comments

Comments
 (0)