From 2211cb9ed1217ee33798b253d93e382e03458bc9 Mon Sep 17 00:00:00 2001 From: markilue <745518019@qq.com> Date: Fri, 14 Apr 2023 10:02:46 +0800 Subject: [PATCH] =?UTF-8?q?leecode=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../markilue/leecode/hot100/T99_MergeTrees.java | 10 ++++++++++ .../com/markilue/leecode/sort/HeapSort.java | 17 +++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 Leecode/src/main/java/com/markilue/leecode/sort/HeapSort.java diff --git a/Leecode/src/main/java/com/markilue/leecode/hot100/T99_MergeTrees.java b/Leecode/src/main/java/com/markilue/leecode/hot100/T99_MergeTrees.java index 7c8f60e..17e56b7 100644 --- a/Leecode/src/main/java/com/markilue/leecode/hot100/T99_MergeTrees.java +++ b/Leecode/src/main/java/com/markilue/leecode/hot100/T99_MergeTrees.java @@ -1,6 +1,7 @@ package com.markilue.leecode.hot100; import com.markilue.leecode.tree.TreeNode; +import org.junit.Test; /** *@BelongsProject: Leecode @@ -16,6 +17,13 @@ import com.markilue.leecode.tree.TreeNode; *@Version: 1.0 */ public class T99_MergeTrees { + @Test + public void test() { + Integer i = 1000; + Integer j = 1000; + System.out.println(i == j); + System.out.println(i.equals(j)); + } /** * 递归法 @@ -24,6 +32,8 @@ public class T99_MergeTrees { * @return */ public TreeNode mergeTrees(TreeNode root1, TreeNode root2) { + + if (root1 == null) { return root2; } else if (root2 == null) { diff --git a/Leecode/src/main/java/com/markilue/leecode/sort/HeapSort.java b/Leecode/src/main/java/com/markilue/leecode/sort/HeapSort.java new file mode 100644 index 0000000..732773e --- /dev/null +++ b/Leecode/src/main/java/com/markilue/leecode/sort/HeapSort.java @@ -0,0 +1,17 @@ +package com.markilue.leecode.sort; + +/** + *@BelongsProject: Leecode + *@BelongsPackage: com.markilue.leecode.sort + *@Author: markilue + *@CreateTime: 2023-04-11 16:00 + *@Description: TODO + *@Version: 1.0 + */ +public class HeapSort { + + + public void heapSort(){ + + } +}