From ff10ea0d9c1df0c61c8cf9212614ba08e1e9a2cc Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 28 Sep 2020 08:44:45 +0800 Subject: [PATCH] fix numberUtil --- CHANGELOG.md | 1 + .../src/main/java/cn/hutool/core/util/NumberUtil.java | 8 ++++---- .../src/test/java/cn/hutool/core/util/NumberUtilTest.java | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bc803394..abef99709 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ * 【dfa 】 SensitiveUtil增加setCharFilter方法(pr#1123@Github) * 【all 】 优化常量大小写规范(pr#188@Gitee) * 【core 】 优化NumberUtil中针对BigDecimal的一些处理逻辑(pr#1127@Github) +* 【core 】 NumberUtil.factorial注释明确(pr#1126@Github) ### Bug修复 * 【crypto 】 修复SM2验签后无法解密问题(issue#I1W0VP@Gitee) diff --git a/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java index 9247fb3d8..f25a66a04 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java @@ -1412,13 +1412,13 @@ public class NumberUtil { // ------------------------------------------------------------------------------------------- others /** - * 计算阶乘 + * 计算范围阶乘 *

- * n! = n * (n-1) * ... * end + * factorial(start, end) = start * (start - 1) * ... * (end - 1) *

* - * @param start 阶乘起始 - * @param end 阶乘结束,必须小于起始 + * @param start 阶乘起始(包含) + * @param end 阶乘结束,必须小于起始(不包括) * @return 结果 * @since 4.1.0 */ diff --git a/hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java index 13ed9740c..60a1c7f4d 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java @@ -245,6 +245,8 @@ public class NumberUtilTest { Assert.assertEquals(120, factorial); factorial = NumberUtil.factorial(5, 1); Assert.assertEquals(120, factorial); + + Assert.assertEquals(5, NumberUtil.factorial(5, 4)); } @Test