|
@@ -1993,11 +1993,11 @@ public class CustomFunction {
|
|
double xND = Double.parseDouble(xN.toString());
|
|
double xND = Double.parseDouble(xN.toString());
|
|
List<Object> outList = new ArrayList<>();
|
|
List<Object> outList = new ArrayList<>();
|
|
if (o instanceof List) {
|
|
if (o instanceof List) {
|
|
- List<Object> datas = (List<Object>) o;
|
|
|
|
|
|
+ List<Object> datas = obj2ListNe(o);
|
|
for (Object e : datas) {
|
|
for (Object e : datas) {
|
|
if (StringUtils.isNotEmpty(e)) {
|
|
if (StringUtils.isNotEmpty(e)) {
|
|
- String[] as = e.toString().split("[^\\d.]");
|
|
|
|
- Object m = matcherFindGroup("[^\\d.]", e.toString(), 0, false);
|
|
|
|
|
|
+ String[] as = e.toString().split("[^\\d.-]");
|
|
|
|
+ Object m = matcherFindGroup("[^\\d.-]", e.toString(), 0, false);
|
|
StringBuilder d = new StringBuilder();
|
|
StringBuilder d = new StringBuilder();
|
|
for (int i = 0; i < as.length; i++) {
|
|
for (int i = 0; i < as.length; i++) {
|
|
String s = as[i];
|
|
String s = as[i];
|
|
@@ -2045,6 +2045,11 @@ public class CustomFunction {
|
|
return "";
|
|
return "";
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+/* public static void main(String[] args) {
|
|
|
|
+ List<Object> list = Arrays.asList(1,-1,"-4*8");
|
|
|
|
+ obj2ListNe(xN(list,10)).forEach(System.out::println);
|
|
|
|
+ }*/
|
|
|
|
+
|
|
public static Object repeat(Object data) {
|
|
public static Object repeat(Object data) {
|
|
List<Object> result = new ArrayList<>();
|
|
List<Object> result = new ArrayList<>();
|
|
if (data != null) {
|
|
if (data != null) {
|