s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update range function to return Integer arrays

Browse Source
This commit is contained in:
Joanne 2018-02-16 01:27:00 +08:00 committed by Antonin Delpeuch
parent 01d8e458f4
commit 41e8c0beee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/com/google/refine/expr/functions/strings/Range.java
View File

@ -30,7 +30,7 @@ public class Range implements Function {
private static final int DEFAULT_START = 0; private static final int DEFAULT_START = 0;
private static final int DEFAULT_STEP = 1; private static final int DEFAULT_STEP = 1;
private static final String[] EMPTY_STRING_ARRAY = new String[0]; private static final Integer[] EMPTY_ARRAY = new Integer[0];
@Override @Override
public Object call(Properties bindings, Object[] args) { public Object call(Properties bindings, Object[] args) {
@ -280,15 +280,15 @@ public class Range implements Function {
*/ */
private static Object createRange(int start, int stop, int step) { private static Object createRange(int start, int stop, int step) {
if ((start > stop && step > 0) || (start < stop && step < 0) || step == 0) { if ((start > stop && step > 0) || (start < stop && step < 0) || step == 0) {
return EMPTY_STRING_ARRAY; return EMPTY_ARRAY;
} }
int rangeSize = (int) (Math.ceil(((double) Math.abs(start - stop))/ Math.abs(step))); int rangeSize = (int) (Math.ceil(((double) Math.abs(start - stop))/ Math.abs(step)));
String[] generatedRange = new String[rangeSize]; Integer[] generatedRange = new Integer[rangeSize];
for (int i = 0; i < rangeSize; i++) { for (int i = 0; i < rangeSize; i++) {
generatedRange[i] = Integer.toString(start + step * i); generatedRange[i] = start + step * i;
} }
return generatedRange; return generatedRange;