Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb4e6ab7

Browse files
refactor 572
1 parent369fe1f commitb4e6ab7

File tree

2 files changed

+57
-32
lines changed

2 files changed

+57
-32
lines changed

‎src/main/java/com/fishercoder/solutions/_572.java

Lines changed: 53 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,38 +41,63 @@
4141
*/
4242
publicclass_572 {
4343

44-
publicbooleanisSubtree(TreeNodes,TreeNodet) {
45-
if (s ==null &&t ==null) {
46-
returntrue;
44+
publicstaticclassSolution1 {
45+
publicbooleanisSubtree(TreeNodes,TreeNodet) {
46+
if (s ==null &&t ==null) {
47+
returntrue;
48+
}
49+
booleanisSubTree =false;
50+
if (s !=null &&t !=null &&s.val ==t.val) {
51+
isSubTree =isSameTree(s,t);
52+
}
53+
if (isSubTree) {
54+
returntrue;
55+
}
56+
booleanisSubTreeLeft =false;
57+
if (s.left !=null) {
58+
isSubTreeLeft =isSubtree(s.left,t);
59+
}
60+
if (isSubTreeLeft) {
61+
returntrue;
62+
}
63+
booleanisSubTreeRight =false;
64+
if (s.right !=null) {
65+
isSubTreeRight =isSubtree(s.right,t);
66+
}
67+
if (isSubTreeRight) {
68+
returntrue;
69+
}
70+
returnfalse;
4771
}
48-
booleanisSubTree =false;
49-
if (s !=null &&t !=null &&s.val ==t.val) {
50-
isSubTree =isSameTree(s,t);
51-
}
52-
if (isSubTree) {
53-
returntrue;
54-
}
55-
booleanisSubTreeLeft =false;
56-
if (s.left !=null) {
57-
isSubTreeLeft =isSubtree(s.left,t);
58-
}
59-
if (isSubTreeLeft) {
60-
returntrue;
61-
}
62-
booleanisSubTreeRight =false;
63-
if (s.right !=null) {
64-
isSubTreeRight =isSubtree(s.right,t);
65-
}
66-
if (isSubTreeRight) {
67-
returntrue;
72+
73+
privatebooleanisSameTree(TreeNodep,TreeNodeq) {
74+
if (p ==null ||q ==null) {
75+
returnp ==q;
76+
}
77+
returnp.val ==q.val &&isSameTree(p.left,q.left) &&isSameTree(p.right,q.right);
6878
}
69-
returnfalse;
7079
}
7180

72-
privatebooleanisSameTree(TreeNodep,TreeNodeq) {
73-
if (p ==null ||q ==null) {
74-
returnp ==q;
81+
publicstaticclassSolution2 {
82+
publicbooleanisSubtree(TreeNodes,TreeNodet) {
83+
if (s ==null) {
84+
returnfalse;
85+
}
86+
if (same(s,t)) {
87+
returntrue;
88+
}
89+
returnisSubtree(s.left,t) ||isSubtree(s.right,t);
90+
}
91+
92+
privatebooleansame(TreeNodes,TreeNodet) {
93+
if (s ==null ||t ==null) {
94+
returns ==t;
95+
}
96+
if (s.val !=t.val) {
97+
returnfalse;
98+
}
99+
returnsame(s.left,t.left) &&same(s.right,t.right);
75100
}
76-
returnp.val ==q.val &&isSameTree(p.left,q.left) &&isSameTree(p.right,q.right);
101+
77102
}
78103
}

‎src/test/java/com/fishercoder/_572Test.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
* Created by fishercoder on 5/6/17.
1212
*/
1313
publicclass_572Test {
14-
privatestatic_572test;
14+
privatestatic_572.Solution1solution1;
1515
privatestaticbooleanexpected;
1616
privatestaticbooleanactual;
1717

1818
@BeforeClass
1919
publicstaticvoidsetup() {
20-
test =new_572();
20+
solution1 =new_572.Solution1();
2121
}
2222

2323
@Test
@@ -33,7 +33,7 @@ public void test1() {
3333
t.left =newTreeNode(1);
3434
t.right =newTreeNode(2);
3535
expected =false;
36-
actual =test.isSubtree(s,t);
36+
actual =solution1.isSubtree(s,t);
3737
assertEquals(expected,actual);
3838
}
3939

@@ -49,7 +49,7 @@ public void test2() {
4949
t.left =newTreeNode(1);
5050
t.right =newTreeNode(2);
5151
expected =true;
52-
actual =test.isSubtree(s,t);
52+
actual =solution1.isSubtree(s,t);
5353
assertEquals(expected,actual);
5454
}
5555
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp