ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Calculator兼容x字符作为乘号（issue#3787@Github）

Browse Source
This commit is contained in:
Looly 2024-11-15 11:29:44 +08:00
parent 7bb487419c
commit 59046eb972
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-core/src/main/java/org/dromara/hutool/core/math/Calculator.java
View File

@ -16,6 +16,7 @@
package org.dromara.hutool.core.math;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.text.StrUtil;
import java.math.BigDecimal;
@ -207,6 +208,9 @@ public class Calculator {
arr[i] = '~';
}
}
} else if(CharUtil.equals(arr[i], 'x', true)){
// issue#3787 x转换为*
arr[i] = '*';
}
}
if (arr[0] == '~' && (arr.length > 1 && arr[1] == '(')) {

29
hutool-core/src/test/java/org/dromara/hutool/core/math/CalculatorTest.java
View File

@ -16,53 +16,54 @@
package org.dromara.hutool.core.math;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class CalculatorTest {
@Test
public void conversationTest(){
final double conversion = Calculator.conversion("(0*1--3)-5/-4-(3*(-2.13))");
Assertions.assertEquals(10.64, conversion, 0);
assertEquals(10.64, conversion, 0);
}
@Test
public void conversationTest2(){
final double conversion = Calculator.conversion("77 * 12");
Assertions.assertEquals(924.0, conversion, 0);
assertEquals(924.0, conversion, 0);
}
@Test
public void conversationTest3(){
final double conversion = Calculator.conversion("1");
Assertions.assertEquals(1, conversion, 0);
assertEquals(1, conversion, 0);
}
@Test
public void conversationTest4(){
final double conversion = Calculator.conversion("(88*66/23)%26+45%9");
Assertions.assertEquals((88D * 66 / 23) % 26, conversion, 0.000000001);
assertEquals((88D * 66 / 23) % 26, conversion, 0.000000001);
}
@Test
public void conversationTest5(){
// https://github.com/dromara/hutool/issues/1984
final double conversion = Calculator.conversion("((1/1) / (1/1) -1) * 100");
Assertions.assertEquals(0, conversion, 0);
assertEquals(0, conversion, 0);
}
@Test
public void conversationTest6() {
final double conversion = Calculator.conversion("-((2.12-2) * 100)");
Assertions.assertEquals(-1D * (2.12D - 2D) * 100D, conversion, 0.00001);
assertEquals(-1D * (2.12D - 2D) * 100D, conversion, 0.00001);
}
@Test
public void conversationTest7() {
//https://gitee.com/dromara/hutool/issues/I4KONB
final double conversion = Calculator.conversion("((-2395+0) * 0.3+140.24+35+90)/30");
Assertions.assertEquals(-15.11D, conversion, 0.01);
assertEquals(-15.11D, conversion, 0.01);
}
@Test
@ -70,6 +71,16 @@ public class CalculatorTest {
// 忽略数字之间的运算符，按照乘法对待。
// https://github.com/dromara/hutool/issues/2964
final double calcValue = Calculator.conversion("(11+2)12");
Assertions.assertEquals(156D, calcValue, 0.001);
assertEquals(156D, calcValue, 0.001);
}
@Test
void issue3787Test() {
final Calculator calculator1 = new Calculator();
double result = calculator1.calculate("0+50/100x(1/0.5)");
assertEquals(1D, result);
result = calculator1.calculate("0+50/100X(1/0.5)");
assertEquals(1D, result);
}
}