Commite787afd

committed

add a solution for 617

1 parentf6931f5 commite787afdCopy full SHA for e787afd

File tree

+32

-8

lines changed

src
- main/java/com/fishercoder/solutions
  - _617.java
- test/java/com/fishercoder
  - _617Test.java

+32

-8

lines changed

Lines changed: 25 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,18 +5,35 @@`
`5`	`5`	`publicclass_617 {`
`6`	`6`
`7`	`7`	`publicstaticclassSolution1 {`
`8`		`-publicTreeNodemergeTrees(TreeNodet1,TreeNodet2) {`
`9`		`-if (t1 ==null) {`
`10`		`-returnt2;`
	`8`	`+publicTreeNodemergeTrees(TreeNoderoot1,TreeNoderoot2) {`
	`9`	`+if (root1 ==null) {`
	`10`	`+returnroot2;`
`11`	`11`	`}`
`12`		`-if (t2 ==null) {`
`13`		`-returnt1;`
	`12`	`+if (root2 ==null) {`
	`13`	`+returnroot1;`
`14`	`14`	`}`
`15`		`-TreeNodemergedNode =newTreeNode(t1.val +t2.val);`
`16`		`-mergedNode.left =mergeTrees(t1.left,t2.left);`
`17`		`-mergedNode.right =mergeTrees(t1.right,t2.right);`
	`15`	`+TreeNodemergedNode =newTreeNode(root1.val +root2.val);`
	`16`	`+mergedNode.left =mergeTrees(root1.left,root2.left);`
	`17`	`+mergedNode.right =mergeTrees(root1.right,root2.right);`
`18`	`18`	`returnmergedNode;`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
	`22`	`+publicstaticclassSolution2 {`
	`23`	`+/**`
	`24`	`+ * My completely original solution on 9/20/2021, no new extra nodes created.`
	`25`	`+ */`
	`26`	`+publicTreeNodemergeTrees(TreeNoderoot1,TreeNoderoot2) {`
	`27`	`+if (root1 ==null) {`
	`28`	`+returnroot2;`
	`29`	`+ }elseif (root2 ==null) {`
	`30`	`+returnroot1;`
	`31`	`+ }`
	`32`	`+root1.val +=root2.val;`
	`33`	`+root1.left =mergeTrees(root1.left,root2.left);`
	`34`	`+root1.right =mergeTrees(root1.right,root2.right);`
	`35`	`+returnroot1;`
	`36`	`+ }`
	`37`	`+ }`
	`38`	`+`
`22`	`39`	`}`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,22 @@`
`11`	`11`
`12`	`12`	`publicclass_617Test {`
`13`	`13`	`privatestatic_617.Solution1solution1;`
	`14`	`+privatestatic_617.Solution2solution2;`
`14`	`15`
`15`	`16`	`@BeforeClass`
`16`	`17`	`publicstaticvoidsetup() {`
`17`	`18`	`solution1 =new_617.Solution1();`
	`19`	`+solution2 =new_617.Solution2();`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`@Test`
`21`	`23`	`publicvoidtest1() {`
`22`	`24`	`assertEquals(TreeUtils.constructBinaryTree(Arrays.asList(3,4,5,5,4,null,7)),solution1.mergeTrees(TreeUtils.constructBinaryTree(Arrays.asList(1,3,2,5)),TreeUtils.constructBinaryTree(Arrays.asList(2,1,3,null,4,null,7))));`
`23`	`25`	`}`
`24`	`26`
	`27`	`+@Test`
	`28`	`+publicvoidtest2() {`
	`29`	`+assertEquals(TreeUtils.constructBinaryTree(Arrays.asList(3,4,5,5,4,null,7)),solution2.mergeTrees(TreeUtils.constructBinaryTree(Arrays.asList(1,3,2,5)),TreeUtils.constructBinaryTree(Arrays.asList(2,1,3,null,4,null,7))));`
	`30`	`+ }`
	`31`	`+`
`25`	`32`	`}`

Comments

(0)