ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2023-03-09 20:48:37 +08:00
parent a5b1e4a76a
commit 728957baa3
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
View File

@ -56,7 +56,10 @@ public class Calculator {
resultStack.push(tempResult.toString()); resultStack.push(tempResult.toString());
} }
} }
return Double.parseDouble(resultStack.pop());
// 当结果集中有多个数字时，可能是省略*，类似(1+2)3
return NumberUtil.mul(resultStack.toArray(new String[0])).doubleValue();
//return Double.parseDouble(resultStack.pop());
} }
/** /**

8
hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java
View File

@ -48,4 +48,12 @@ public class CalculatorTest {
final double conversion = Calculator.conversion("((-2395+0) * 0.3+140.24+35+90)/30"); final double conversion = Calculator.conversion("((-2395+0) * 0.3+140.24+35+90)/30");
Assert.assertEquals(-15.11D, conversion, 0.01); Assert.assertEquals(-15.11D, conversion, 0.01);
} }
@Test
public void issue2964Test() {
// 忽略数字之间的运算符，按照乘法对待。
// https://github.com/dromara/hutool/issues/2964
final double calcValue = Calculator.conversion("(11+2)12");
Assert.assertEquals(156D, calcValue, 0.001);
}
} }