[pull] master from youngyangyang04:master #4

Original file line number	Diff line number	Diff line change
Expand Up		@@ -564,6 +564,57 @@ int** generateMatrix(int n, int* returnSize, int** returnColumnSizes){
		return ans;
		}
		```

	Scala:
	```scala
	object Solution {
	def generateMatrix(n: Int): Array[Array[Int]] = {
	var res = Array.ofDim[Int](n, n) // 定义一个n*n的二维矩阵
	var num = 1 // 标志当前到了哪个数字
	var i = 0 // 横坐标
	var j = 0 // 竖坐标

	while (num <= n * n) {
	// 向右:当j不越界,并且下一个要填的数字是空白时
	while (j < n && res(i)(j) == 0) {
	res(i)(j) = num // 当前坐标等于num
	num += 1 // num++
	j += 1 // 竖坐标+1
	}
	i += 1 // 下移一行
	j -= 1 // 左移一列

	// 剩下的都同上

	// 向下
	while (i < n && res(i)(j) == 0) {
	res(i)(j) = num
	num += 1
	i += 1
	}
	i -= 1
	j -= 1

	// 向左
	while (j >= 0 && res(i)(j) == 0) {
	res(i)(j) = num
	num += 1
	j -= 1
	}
	i -= 1
	j += 1

	// 向上
	while (i >= 0 && res(i)(j) == 0) {
	res(i)(j) = num
	num += 1
	i -= 1
	}
	i += 1
	j += 1
	}
	res
	}
	}
	```
		-----------------------
		<div align="center"><img src=https://code-thinking.cdn.bcebos.com/pics/01二维码一.jpg width=500> </img></div>

20 changes: 20 additions & 0 deletions problems/0102.二叉树的层序遍历.md

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -82,6 +82,26 @@ public:
		}
		};
		```
	```CPP
	# 递归法
	class Solution {
	public:
	void order(TreeNode* cur, vector<vector<int>>& result, int depth)
	{
	if (cur == nullptr) return;
	if (result.size() == depth) result.push_back(vector<int>());
	result[depth].push_back(cur->val);
	order(cur->left, result, depth + 1);
	order(cur->right, result, depth + 1);
	}
	vector<vector<int>> levelOrder(TreeNode* root) {
	vector<vector<int>> result;
	int depth = 0;
	order(root, result, depth);
	return result;
	}
	};
	```

		python3代码:

Expand Down

32 changes: 31 additions & 1 deletion problems/0203.移除链表元素.md

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -478,6 +478,36 @@ impl Solution {
		}
		}
		```

	Scala:
	```scala
	/**
	* Definition for singly-linked list.
	* class ListNode(_x: Int = 0, _next: ListNode = null) {
	* var next: ListNode = _next
	* var x: Int = _x
	* }
	*/
	object Solution {
	def removeElements(head: ListNode, `val`: Int): ListNode = {
	if (head == null) return head
	var dummy = new ListNode(-1, head) // 定义虚拟头节点
	var cur = head // cur 表示当前节点
	var pre = dummy // pre 表示cur前一个节点
	while (cur != null) {
	if (cur.x == `val`) {
	// 相等,就删除那么cur的前一个节点pre执行cur的下一个
	pre.next = cur.next
	} else {
	// 不相等,pre就等于当前cur节点
	pre = cur
	}
	// 向下迭代
	cur = cur.next
	}
	// 最终返回dummy的下一个,就是链表的头
	dummy.next
	}
	}
	```
		-----------------------
		<div align="center"><img src=https://code-thinking.cdn.bcebos.com/pics/01二维码一.jpg width=500> </img></div>

7 changes: 7 additions & 0 deletions problems/链表理论基础.md

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -210,6 +210,13 @@ type ListNode struct {
		}
		```

	Scala:
	```scala
	class ListNode(_x: Int = 0, _next: ListNode = null) {
	var next: ListNode = _next
	var x: Int = _x
	}
	```


		-----------------------
Expand Down

Navigation Menu