Merge branch 'main' into swift

# Conflicts:
#	animation-simulation/数组篇/leetcode219数组中重复元素2.md
#	animation-simulation/数组篇/leetcode59螺旋矩阵2.md
#	animation-simulation/数组篇/leetcode66加一.md
#	animation-simulation/数组篇/leetcode75颜色分类.md
This commit is contained in:
zhenzi
2021-07-17 12:33:02 +08:00
22 changed files with 1404 additions and 476 deletions

View File

@@ -78,6 +78,22 @@ class Solution:
return False
```
C++ Code:
```cpp
class Solution {
public:
bool containsNearbyDuplicate(vector<int>& nums, int k) {
unordered_map <int, int> m;
for(int i = 0; i < nums.size(); ++i){
if(m.count(nums[i]) && i - m[nums[i]] <= k) return true;
m[nums[i]] = i;
}
return false;
}
};
```
Swift Code
```swift
@@ -165,7 +181,24 @@ class Solution:
if len(s) > k:
s.remove(nums[i - k])
return False
```
```
C++ Code:
```cpp
class Solution {
public:
bool containsNearbyDuplicate(vector<int>& nums, int k) {
multiset <int> S;
for(int i = 0; i < nums.size(); ++i){
if(S.count(nums[i])) return true;
S.insert(nums[i]);
if(S.size() > k) S.erase(nums[i - k]);
}
return false;
}
};
```
Swift Code
@@ -190,4 +223,4 @@ class Solution {
return false
}
}
```
```

View File

@@ -85,6 +85,42 @@ class Solution {
```
C++ Code:
```cpp
class Solution {
public:
vector<int> spiralOrder(vector<vector<int>>& matrix) {
vector <int> arr;
int left = 0, right = matrix[0].size()-1;
int top = 0, down = matrix.size()-1;
while (true) {
for (int i = left; i <= right; ++i) {
arr.emplace_back(matrix[top][i]);
}
top++;
if (top > down) break;
for (int i = top; i <= down; ++i) {
arr.emplace_back(matrix[i][right]);
}
right--;
if (left > right) break;
for (int i = right; i >= left; --i) {
arr.emplace_back(matrix[down][i]);
}
down--;
if (top > down) break;
for (int i = down; i >= top; --i) {
arr.emplace_back(matrix[i][left]);
}
left++;
if (left > right) break;
}
return arr;
}
};
```
Python3 Code:
```python

View File

@@ -140,6 +140,42 @@ class Solution:
return arr
```
C++ Code:
```cpp
class Solution {
public:
vector<int> spiralOrder(vector<vector<int>>& matrix) {
vector <int> arr;
int left = 0, right = matrix[0].size()-1;
int top = 0, down = matrix.size()-1;
while (true) {
for (int i = left; i <= right; ++i) {
arr.emplace_back(matrix[top][i]);
}
top++;
if (top > down) break;
for (int i = top; i <= down; ++i) {
arr.emplace_back(matrix[i][right]);
}
right--;
if (left > right) break;
for (int i = right; i >= left; --i) {
arr.emplace_back(matrix[down][i]);
}
down--;
if (top > down) break;
for (int i = down; i >= top; --i) {
arr.emplace_back(matrix[i][left]);
}
left++;
if (left > right) break;
}
return arr;
}
};
```
Swift Code:
```swift
@@ -263,6 +299,42 @@ class Solution:
return arr.tolist()
```
C++ Code:
```cpp
class Solution {
public:
vector<vector<int>> generateMatrix(int n) {
vector <vector <int>> arr(n, vector <int>(n));
int left = 0, right = n-1, top = 0, buttom = n - 1, num = 1, numsize = n * n;
while (true) {
for (int i = left; i <= right; ++i) {
arr[top][i] = num++;
}
top++;
if (num > numsize) break;
for (int i = top; i <= buttom; ++i) {
arr[i][right] = num++;
}
right--;
if (num > numsize) break;
for (int i = right; i >= left; --i) {
arr[buttom][i] = num++;
}
buttom--;
if (num > numsize) break;
for (int i = buttom; i >= top; --i) {
arr[i][left] = num++;
}
left++;
if (num > numsize) break;
}
return arr;
}
};
```
Swift Code:
```swift
@@ -304,4 +376,3 @@ class Solution {
}
}
```

View File

@@ -3,7 +3,6 @@
> 感谢支持该仓库会一直维护希望对各位有一丢丢帮助
>
> 另外希望手机阅读的同学可以来我的 <u>[**公众号袁厨的算法小屋**](https://raw.githubusercontent.com/tan45du/test/master/微信图片_20210320152235.2pthdebvh1c0.png)</u> 两个平台同步,想要和题友一起刷题,互相监督的同学,可以在我的小屋点击<u>[**刷题小队**](https://raw.githubusercontent.com/tan45du/test/master/微信图片_20210320152235.2pthdebvh1c0.png)</u>进入。
>
#### [66. 加一](https://leetcode-cn.com/problems/plus-one/)
@@ -86,6 +85,24 @@ class Solution:
return arr
```
C++ Code:
```cpp
class Solution {
public:
vector<int> plusOne(vector<int>& digits) {
for(int i = digits.size() - 1; i >= 0; --i){
digits[i] = (digits[i] + 1)%10;
if(digits[i]) return digits;
}
for(int & x: digits) x = 0;
digits.emplace_back(1);
reverse(digits.begin(), digits.end());
return digits;
}
};
```
Swift Code:
```swift
@@ -105,3 +122,4 @@ class Solution {
}
}
```

View File

@@ -96,6 +96,27 @@ class Solution:
nums[j] = temp
```
C++ Code:
```cpp
class Solution {
public:
void sortColors(vector<int>& nums) {
int len = nums.size(), left = 0;
int i = left, right = len-1;
while (i <= right) {
if (nums[i] == 2) {
swap(nums[i],nums[right--]);
} else if (nums[i] == 0) {
swap(nums[i++],nums[left++]);
} else {
i++;
}
}
}
};
```
Swift Code:
```swift
@@ -208,6 +229,29 @@ class Solution:
nums[j] = temp
```
C++ Code:
```cpp
class Solution {
public:
void sortColors(vector<int>& nums) {
int left = 0, len = nums.size();
int right = len - 1;
for (int i = 0; i <= right; ++i) {
if (nums[i] == 0) {
swap(nums[i],nums[left++]);
}
if (nums[i] == 2) {
swap(nums[i],nums[right--]);
if (nums[i] != 1) {
i--;
}
}
}
}
};
```
Swift Code:
```swift