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

Commit8cccb10

Browse files
refactor 227
1 parentd55e362 commit8cccb10

File tree

2 files changed

+35
-39
lines changed

2 files changed

+35
-39
lines changed
Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
packagecom.fishercoder.solutions;
22

3-
43
importjava.util.ArrayDeque;
54
importjava.util.Deque;
65

@@ -21,38 +20,38 @@
2120
*/
2221
publicclass_227 {
2322

24-
/**Credit: https://discuss.leetcode.com/topic/16935/share-my-java-solution*/
25-
publicintcalculate(Strings) {
26-
if (s ==null ||s.length() ==0) {
27-
return0;
28-
}
29-
intlen =s.length();
30-
Deque<Integer>stack =newArrayDeque<>();
31-
intnum =0;
32-
charsign ='+';
33-
for (inti =0;i <len;i++) {
34-
if (Character.isDigit(s.charAt(i))) {
35-
num =num *10 +s.charAt(i) -'0';
23+
publicstaticclassSolution1 {
24+
publicintcalculate(Strings) {
25+
if (s ==null ||s.length() ==0) {
26+
return0;
3627
}
37-
if ((!Character.isDigit(s.charAt(i))) &&' ' !=s.charAt(i) ||i ==len -1) {
38-
if (sign =='+') {
39-
stack.addLast(num);
40-
}elseif (sign =='-') {
41-
stack.addLast(-num);
42-
}elseif (sign =='/') {
43-
stack.addLast(stack.pollLast() /num);
44-
}elseif (sign =='*') {
45-
stack.addLast(stack.pollLast() *num);
28+
intlen =s.length();
29+
Deque<Integer>stack =newArrayDeque<>();
30+
intnum =0;
31+
charsign ='+';
32+
for (inti =0;i <len;i++) {
33+
if (Character.isDigit(s.charAt(i))) {
34+
num =num *10 +s.charAt(i) -'0';
35+
}
36+
if ((!Character.isDigit(s.charAt(i))) &&' ' !=s.charAt(i) ||i ==len -1) {
37+
if (sign =='+') {
38+
stack.addLast(num);
39+
}elseif (sign =='-') {
40+
stack.addLast(-num);
41+
}elseif (sign =='/') {
42+
stack.addLast(stack.pollLast() /num);
43+
}elseif (sign =='*') {
44+
stack.addLast(stack.pollLast() *num);
45+
}
46+
sign =s.charAt(i);
47+
num =0;
4648
}
47-
sign =s.charAt(i);
48-
num =0;
4949
}
50+
intresult =0;
51+
while (!stack.isEmpty()) {
52+
result +=stack.poll();
53+
}
54+
returnresult;
5055
}
51-
intresult =0;
52-
while (!stack.isEmpty()) {
53-
result +=stack.poll();
54-
}
55-
returnresult;
5656
}
57-
5857
}

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,32 @@
66

77
importstaticorg.junit.Assert.assertEquals;
88

9-
/**
10-
* Created by stevesun on 5/29/17.
11-
*/
129
publicclass_227Test {
13-
privatestatic_227test;
10+
privatestatic_227.Solution1solution1;
1411

1512
@BeforeClass
1613
publicstaticvoidsetup() {
17-
test =new_227();
14+
solution1 =new_227.Solution1();
1815
}
1916

2017
@Test
2118
publicvoidtest1() {
22-
assertEquals(7,test.calculate("3+2*2"));
19+
assertEquals(7,solution1.calculate("3+2*2"));
2320
}
2421

2522
@Test
2623
publicvoidtest2() {
27-
assertEquals(1,test.calculate(" 3/2 "));
24+
assertEquals(1,solution1.calculate(" 3/2 "));
2825
}
2926

3027
@Test
3128
publicvoidtest3() {
32-
assertEquals(5,test.calculate(" 3+5 / 2 "));
29+
assertEquals(5,solution1.calculate(" 3+5 / 2 "));
3330
}
3431

3532
@Test
3633
publicvoidtest4() {
37-
assertEquals(27,test.calculate("100000000/1/2/3/4/5/6/7/8/9/10"));
34+
assertEquals(27,solution1.calculate("100000000/1/2/3/4/5/6/7/8/9/10"));
3835
}
3936

4037
}

0 commit comments

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