Commit e0d5122

committed

提交226

1 parent 3aecd08 commit e0d5122Copy full SHA for e0d5122

File tree

+38

-10

lines changed

+38

-10

lines changed

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,25 +15,20 @@ public static void main(String[] args) {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public ListNode mergeTwoLists(ListNode l1, ListNode l2) {`
`18`		`- // 当l1为空,返回l2`
`19`	`18`	`if (l1 == null) {`
`20`	`19`	`return l2;`
`21`	`20`	`}`
`22`		`-`
`23`		`- // 当l2位空,返回l1`
`24`	`21`	`if (l2 == null) {`
`25`	`22`	`return l1;`
`26`	`23`	`}`
`27`	`24`
`28`		`- // 当l1的值小于l2时`
`29`		`- if (l1.val < l2.val) {`
`30`		`- l1.next = mergeTwoLists(l1.next, l2);`
`31`		`- return l1;`
`32`		`- } else {`
	`25`	`+ if (l1.val > l2.val) {`
`33`	`26`	`l2.next = mergeTwoLists(l2.next, l1);`
`34`	`27`	`return l2;`
	`28`	`+ } else {`
	`29`	`+ l1.next = mergeTwoLists(l2, l1.next);`
	`30`	`+ return l1;`
`35`	`31`	`}`
`36`		`-`
`37`	`32`	`}`
`38`	`33`
`39`	`34`

Lines changed: 32 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,32 @@`
	`1`	`+package com.mistray.tree;`
	`2`	`+`
	`3`	`+/**`
	`4`	`+ * @author ZJY(MistRay)`
	`5`	`+ * @Project algorithm-study`
	`6`	`+ * @Package com.mistray.tree`
	`7`	`+ * @create 2020年03月05日 16:57`
	`8`	`+ * @Desc`
	`9`	`+ */`
	`10`	`+public class InvertBinaryTree226 {`
	`11`	`+ public static void main(String[] args) {`
	`12`	`+ TreeNode root = new TreeNode(4);`
	`13`	`+ root.left = new TreeNode(2);`
	`14`	`+ root.left.left = new TreeNode(1);`
	`15`	`+ root.left.right = new TreeNode(3);`
	`16`	`+ root.right = new TreeNode(7);`
	`17`	`+ root.right.right = new TreeNode(9);`
	`18`	`+ root.right.left = new TreeNode(6);`
	`19`	`+ invertTree(root);`
	`20`	`+ }`
	`21`	`+`
	`22`	`+ public static TreeNode invertTree(TreeNode root) {`
	`23`	`+ if (root == null) {`
	`24`	`+ return null;`
	`25`	`+ }`
	`26`	`+ TreeNode left = invertTree(root.left);`
	`27`	`+ TreeNode right = invertTree(root.right);`
	`28`	`+ root.right = left;`
	`29`	`+ root.left = right;`
	`30`	`+ return root;`
	`31`	`+ }`
	`32`	`+}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ public static void main(String[] args) {`
`16`	`16`	`public TreeNode mergeTrees(TreeNode t1, TreeNode t2) {`
`17`	`17`	`if (t1 == null && t2 == null) {`
`18`	`18`	`return null;`
`19`		`- } else if (t1 == null) {`
	`19`	`+ }`
	`20`	`+ if (t1 == null) {`
`20`	`21`	`return t2;`
`21`	`22`	`} else if (t2 == null) {`
`22`	`23`	`return t1;`

Comments

(0)