Skip to content

Commit 0b3d18b

Browse files
committed
Change Clang-Format to Google Style and use JSHint
1 parent a9525cf commit 0b3d18b

12 files changed

+127
-61
lines changed

JavaScript/Array/3Sum-Closest.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @return {number}
55
*/
66
var threeSumClosest = function(nums, target) {
7-
nums = nums.sort((x, y) => x - y);
7+
nums = nums.sort(function(x, y) { return (x - y); });
88
var minDistance, closestSum;
99
for (var i = 0; i < nums.length - 2; i++) {
1010
if (i === 0) {
@@ -24,4 +24,4 @@ var threeSumClosest = function(nums, target) {
2424
return closestSum;
2525
};
2626

27-
console.log(threeSumClosest([ -1, 2, 1, -4 ], 1));
27+
console.log(threeSumClosest([-1, 2, 1, -4], 1));

JavaScript/Array/3Sum.js

+6-8
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
* @return {number[][]}
44
*/
55
var threeSum = function(nums) {
6-
nums = nums.sort((x, y) => x - y);
6+
nums = nums.sort(function(x, y) { return (x - y); });
77
var arr = Array();
88
var last = Array();
99
for (var i = 0; i < nums.length - 2; i++) {
10-
if (i > 0 && nums[i] == nums[i - 1])
11-
continue;
10+
if (i > 0 && nums[i] == nums[i - 1]) continue;
1211
for (var j = i + 1; j < nums.length - 1; j++) {
1312
var k = j + 1;
1413
var sum = -nums[i] - nums[j];
1514
while (k < nums.length && nums[k] < sum) {
1615
k++;
1716
}
1817
if (k < nums.length && nums[k] == sum) {
19-
var triplet = [ nums[i], nums[j], nums[k] ];
18+
var triplet = [nums[i], nums[j], nums[k]];
2019
if (!last.length || last.join('') !== triplet.join('')) {
2120
arr.push(triplet);
2221
last = triplet;
@@ -27,7 +26,6 @@ var threeSum = function(nums) {
2726
return arr;
2827
};
2928

30-
console.log(threeSum([ -1, 0, 1, 2, -1, -4 ]));
31-
console.log(
32-
threeSum([ -4, -2, 1, -5, -4, -4, 4, -2, 0, 4, 0, -2, 3, 1, -5, 0 ]));
33-
console.log(threeSum([ 0, -4, -5, 3, 1, 3, 4, 2, -5, 2, 4, 2, -5 ]));
29+
console.log(threeSum([-1, 0, 1, 2, -1, -4]));
30+
console.log(threeSum([-4, -2, 1, -5, -4, -4, 4, -2, 0, 4, 0, -2, 3, 1, -5, 0]));
31+
console.log(threeSum([0, -4, -5, 3, 1, 3, 4, 2, -5, 2, 4, 2, -5]));

JavaScript/Array/4Sum.js

+90-17
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @return {number[][]}
55
*/
66
var fourSum = function(nums, target) {
7-
nums = nums.sort((x, y) => x - y);
7+
nums = nums.sort(function(x, y) { return (x - y); });
88
var hash = Array();
99
var keys = Array();
1010
var arr = Array();
@@ -18,31 +18,29 @@ var fourSum = function(nums, target) {
1818
hash[num] = Array();
1919
keys.push(num);
2020
}
21-
hash[num].push([ i, j ]);
21+
hash[num].push([i, j]);
2222
}
2323
}
2424
for (i = 0; i < keys.length; i++) {
25-
if (keys[i] > target - keys[i])
26-
continue;
25+
if (keys[i] > target - keys[i]) continue;
2726
var pair1 = hash[keys[i]];
2827
var pair2 = hash[target - keys[i]];
29-
if (!pair2)
30-
continue;
28+
if (!pair2) continue;
3129
for (j = 0; j < pair1.length; j++) {
3230
for (k = 0; k < pair2.length; k++) {
3331
var indexPair = pair1[j].concat(pair2[k]);
34-
if (indexHash[indexPair.join('')])
35-
continue;
32+
if (indexHash[indexPair.join('')]) continue;
3633
indexHash[indexPair.join('')] = true;
37-
indexPair.sort((x, y) => x - y);
34+
indexPair.sort(function(x, y) { return (x - y); });
3835
if (indexPair[0] == indexPair[1] || indexPair[1] == indexPair[2] ||
3936
indexPair[2] == indexPair[3])
4037
continue;
4138

4239
var numPair = Array();
43-
indexPair.map(index => numPair.push(nums[index]));
44-
if (numHash[numPair.join('')])
45-
continue;
40+
for (var index in indexPair) {
41+
numPair.push(nums[index]);
42+
}
43+
if (numHash[numPair.join('')]) continue;
4644
numHash[numPair.join('')] = true;
4745
arr.push(numPair);
4846
}
@@ -51,8 +49,83 @@ var fourSum = function(nums, target) {
5149
return arr;
5250
};
5351

54-
// console.log(fourSum([1, 0, -1, 0, -2, 2], 0));
55-
// console.log(fourSum([-482,-468,-465,-460,-451,-428,-426,-415,-411,-405,-396,-394,-372,-370,-368,-361,-358,-353,-352,-334,-318,-300,-287,-273,-251,-241,-239,-218,-215,-212,-187,-185,-170,-145,-123,-112,-73,-63,-58,-36,-19,34,42,47,85,113,126,128,134,180,181,199,206,221,229,242,243,255,262,270,305,372,393,405,420,427,428,433,446,458,469,471,486],
56-
// -3524));
57-
console.log(fourSum([ 0, 0, 0, 0 ], 0));
58-
console.log(fourSum([ 0, 0, 0, 0 ], 1));
52+
console.log(fourSum([1, 0, -1, 0, -2, 2], 0));
53+
console.log(fourSum(
54+
[
55+
-482,
56+
-468,
57+
-465,
58+
-460,
59+
-451,
60+
-428,
61+
-426,
62+
-415,
63+
-411,
64+
-405,
65+
-396,
66+
-394,
67+
-372,
68+
-370,
69+
-368,
70+
-361,
71+
-358,
72+
-353,
73+
-352,
74+
-334,
75+
-318,
76+
-300,
77+
-287,
78+
-273,
79+
-251,
80+
-241,
81+
-239,
82+
-218,
83+
-215,
84+
-212,
85+
-187,
86+
-185,
87+
-170,
88+
-145,
89+
-123,
90+
-112,
91+
-73,
92+
-63,
93+
-58,
94+
-36,
95+
-19,
96+
34,
97+
42,
98+
47,
99+
85,
100+
113,
101+
126,
102+
128,
103+
134,
104+
180,
105+
181,
106+
199,
107+
206,
108+
221,
109+
229,
110+
242,
111+
243,
112+
255,
113+
262,
114+
270,
115+
305,
116+
372,
117+
393,
118+
405,
119+
420,
120+
427,
121+
428,
122+
433,
123+
446,
124+
458,
125+
469,
126+
471,
127+
486
128+
],
129+
-3524));
130+
console.log(fourSum([0, 0, 0, 0], 0));
131+
console.log(fourSum([0, 0, 0, 0], 1));

JavaScript/Array/Find-Minimum-in-Rotated-Sorted-Array-II.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
var findMin = function(nums) {
66
var start = 0, end = nums.length - 1;
77
while (start < end - 1) {
8-
if (nums[end] > nums[start])
9-
return nums[start];
8+
if (nums[end] > nums[start]) return nums[start];
109
var mid = parseInt((start + end) / 2);
1110
if (nums[mid] == nums[start]) {
1211
start++;
@@ -20,4 +19,4 @@ var findMin = function(nums) {
2019
};
2120

2221
// console.log(findMin([2, 2, 2, 1]));
23-
console.log(findMin([ 10, 1, 10, 10, 10 ]));
22+
console.log(findMin([10, 1, 10, 10, 10]));

JavaScript/Array/Find-Minimum-in-Rotated-Sorted-Array.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
var findMin = function(nums) {
66
var start = 0, end = nums.length - 1;
77
while (start < end - 1) {
8-
if (nums[end] > nums[start])
9-
return nums[start];
8+
if (nums[end] > nums[start]) return nums[start];
109
var mid = parseInt((start + end) / 2);
1110
if (nums[mid] > nums[start]) {
1211
start = mid;
@@ -17,6 +16,6 @@ var findMin = function(nums) {
1716
return Math.min(nums[start], nums[end]);
1817
};
1918

20-
console.log(findMin([ 4, 5, 6, 0, 1, 2 ]));
21-
console.log(findMin([ 1, 2, 3 ]));
19+
console.log(findMin([4, 5, 6, 0, 1, 2]));
20+
console.log(findMin([1, 2, 3]));
2221
console.log(findMin([]));

JavaScript/Array/Largest-Rectangle-in-Histogram.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ var largestRectangleArea = function(height) {
1212
arr.push(i++);
1313
} else {
1414
var bar = arr.pop();
15-
area = Math.max(area, height[bar] *
16-
(arr.length ? i - arr[arr.length - 1] - 1 : i));
15+
area = Math.max(
16+
area, height[bar] * (arr.length ? i - arr[arr.length - 1] - 1 : i));
1717
}
1818
}
1919
return area;
2020
};
2121

22-
console.log(largestRectangleArea([ 2, 1, 5, 6, 2, 3 ]));
23-
console.log(largestRectangleArea([ 2, 1, 2 ]));
24-
console.log(largestRectangleArea([ 1, 2, 2 ]));
25-
console.log(largestRectangleArea([ 4, 2, 0, 3, 2, 5 ]));
26-
console.log(largestRectangleArea([ 3, 2, 5 ]));
27-
console.log(largestRectangleArea([ 3, 6, 5, 7, 4, 8, 1, 0 ]));
22+
console.log(largestRectangleArea([2, 1, 5, 6, 2, 3]));
23+
console.log(largestRectangleArea([2, 1, 2]));
24+
console.log(largestRectangleArea([1, 2, 2]));
25+
console.log(largestRectangleArea([4, 2, 0, 3, 2, 5]));
26+
console.log(largestRectangleArea([3, 2, 5]));
27+
console.log(largestRectangleArea([3, 6, 5, 7, 4, 8, 1, 0]));

JavaScript/Array/Merge-Sorted-Array.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ var merge = function(nums1, m, nums2, n) {
2121
}
2222
};
2323

24-
console.log(merge([ 1 ], 1, [], 0));
24+
console.log(merge([1], 1, [], 0));

JavaScript/Array/Plus-One.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ var plusOne = function(digits) {
1414
return digits;
1515
};
1616

17-
console.log(plusOne([ 9 ]));
17+
console.log(plusOne([9]));

JavaScript/Array/Remove-Duplicates-from-Sorted-Array-II.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
var removeDuplicates = function(nums) {
66
for (var i = 1, j = 0, count = 0; i < nums.length; i++) {
77
if (nums[i] == nums[j]) {
8-
if (++count > 1)
9-
continue;
8+
if (++count > 1) continue;
109
} else {
1110
count = 0;
1211
}
@@ -15,4 +14,4 @@ var removeDuplicates = function(nums) {
1514
return nums.length ? ++j : 0;
1615
};
1716

18-
console.log(removeDuplicates([ 1, 2 ]));
17+
console.log(removeDuplicates([1, 2]));

JavaScript/Array/Remove-Duplicates-from-Sorted-Array.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
*/
55
var removeDuplicates = function(nums) {
66
for (var i = 1, j = 0; i < nums.length; i++) {
7-
if (nums[i] != nums[j])
8-
nums[++j] = nums[i];
7+
if (nums[i] != nums[j]) nums[++j] = nums[i];
98
}
109
return nums.length ? ++j : 0;
1110
};
1211

13-
console.log(removeDuplicates([ 1, 2 ]));
12+
console.log(removeDuplicates([1, 2]));

JavaScript/Array/Remove-Element.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
*/
66
var removeElement = function(nums, val) {
77
for (var i = 0, j = 0; i < nums.length; i++) {
8-
if (nums[i] == val)
9-
continue;
8+
if (nums[i] == val) continue;
109
nums[j] = nums[i];
1110
j++;
1211
}
1312
return j;
1413
};
1514

16-
console.log(removeElement([ 3, 3 ], 3));
15+
console.log(removeElement([3, 3], 3));

JavaScript/Array/Two-Sum.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
* @param {number} target
44
* @return {number[]}
55
*/
6-
var twoSum =
7-
function(nums, target) {
8-
nums = nums.sort((x, y) => x - y);
6+
var twoSum = function(nums, target) {
7+
nums = nums.sort(function(x, y) { return (x - y); });
98
var arr = Array();
10-
for (var i = 0; i < nums.length; i++) {
9+
var i;
10+
for (i = 0; i < nums.length; i++) {
1111
arr[nums[i]] = i;
1212
}
13-
for (var i = 0; i < nums.length; i++) {
13+
for (i = 0; i < nums.length; i++) {
1414
var index = arr[target - nums[i]];
1515
if (i < index) {
16-
return [ i + 1, index + 1 ];
16+
return [i + 1, index + 1];
1717
}
1818
}
19-
}
19+
};
2020

21-
console.log(twoSum([ 3, 2, 4 ], 6))
21+
console.log(twoSum([3, 2, 4], 6));

0 commit comments

Comments
 (0)