|
@@ -1516,7 +1516,7 @@ public class NumberUtil {
|
|
|
*/
|
|
*/
|
|
|
public static int processMultiple(int selectNum, int minNum) {
|
|
public static int processMultiple(int selectNum, int minNum) {
|
|
|
int result;
|
|
int result;
|
|
|
- result = mathSubnode(selectNum, minNum) / mathNode(selectNum - minNum);
|
|
|
|
|
|
|
+ result = mathSubNode(selectNum, minNum) / mathNode(selectNum - minNum);
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -2493,64 +2493,12 @@ public class NumberUtil {
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- /**
|
|
|
|
|
- * 检查value是否在[min,max]范围内
|
|
|
|
|
- *
|
|
|
|
|
- * @param min 最小值
|
|
|
|
|
- * @param max 最大值
|
|
|
|
|
- * @param value 被检查值
|
|
|
|
|
- * @return 检查结果,范围内将返回true,否则返回false
|
|
|
|
|
- * @since 5.5.4
|
|
|
|
|
- */
|
|
|
|
|
- public static boolean isBetween(int min, int max, int value) {
|
|
|
|
|
- return value >= min && value <= max;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 检查value是否在[min,max]范围内
|
|
|
|
|
- *
|
|
|
|
|
- * @param min 最小值
|
|
|
|
|
- * @param max 最大值
|
|
|
|
|
- * @param value 被检查值
|
|
|
|
|
- * @return 检查结果,范围内将返回true,否则返回false
|
|
|
|
|
- * @since 5.5.4
|
|
|
|
|
- */
|
|
|
|
|
- public static boolean isBetween(long min, long max, long value) {
|
|
|
|
|
- return value >= min && value <= max;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 检查value是否在[min,max]范围内
|
|
|
|
|
- *
|
|
|
|
|
- * @param min 最小值
|
|
|
|
|
- * @param max 最大值
|
|
|
|
|
- * @param value 被检查值
|
|
|
|
|
- * @return 检查结果,范围内将返回true,否则返回false
|
|
|
|
|
- * @since 5.5.4
|
|
|
|
|
- */
|
|
|
|
|
- public static boolean isBetween(float min, float max, float value) {
|
|
|
|
|
- return value >= min && value <= max;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 检查value是否在[min,max]范围内
|
|
|
|
|
- *
|
|
|
|
|
- * @param min 最小值
|
|
|
|
|
- * @param max 最大值
|
|
|
|
|
- * @param value 被检查值
|
|
|
|
|
- * @return 检查结果,范围内将返回true,否则返回false
|
|
|
|
|
- * @since 5.5.4
|
|
|
|
|
- */
|
|
|
|
|
- public static boolean isBetween(double min, double max, double value) {
|
|
|
|
|
- return value >= min && value <= max;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
// ------------------------------------------------------------------------------------------- Private method start
|
|
// ------------------------------------------------------------------------------------------- Private method start
|
|
|
- private static int mathSubnode(int selectNum, int minNum) {
|
|
|
|
|
|
|
+ private static int mathSubNode(int selectNum, int minNum) {
|
|
|
if (selectNum == minNum) {
|
|
if (selectNum == minNum) {
|
|
|
return 1;
|
|
return 1;
|
|
|
} else {
|
|
} else {
|
|
|
- return selectNum * mathSubnode(selectNum - 1, minNum);
|
|
|
|
|
|
|
+ return selectNum * mathSubNode(selectNum - 1, minNum);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|