|
@@ -246,10 +246,11 @@ public class FormulaTurnPoint implements FormulaStrategy {
|
|
List<Object> tmp=new ArrayList<>();
|
|
List<Object> tmp=new ArrayList<>();
|
|
for(List<TurnPoint> list:result){
|
|
for(List<TurnPoint> list:result){
|
|
double n=list.size();
|
|
double n=list.size();
|
|
- double x= Math.sqrt(list.stream().filter(s-> ZD.equals(s.getType())).count()+1)*6;
|
|
|
|
|
|
+ double x= Math.sqrt(list.stream().filter(s-> StringUtils.isNumber(s.getBmd())).count())*6;
|
|
int m= (int) Math.ceil(n/rowSize);
|
|
int m= (int) Math.ceil(n/rowSize);
|
|
tmp.addAll(Collections.nCopies(m,x));
|
|
tmp.addAll(Collections.nCopies(m,x));
|
|
}
|
|
}
|
|
|
|
+ tmp=tmp.stream().map(v->StringUtils.number2String(v,1)).collect(Collectors.toList());
|
|
FormulaUtils.write(t,tmp,false);
|
|
FormulaUtils.write(t,tmp,false);
|
|
});
|
|
});
|
|
}
|
|
}
|