Skip to content

Commit 91f085b

Browse files
BaunsgaardBaunsgaard
committed
format arrays
1 parent 9d8418e commit 91f085b

File tree

9 files changed

+13
-61
lines changed

9 files changed

+13
-61
lines changed

‎src/main/java/org/apache/sysds/runtime/frame/data/columns/ArrayWrapper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828
public class ArrayWrapper implements Writable {
2929

30-
public Array<?> _a;
30+
public Array<?> _a;
3131

32-
public ArrayWrapper(Array<?> a){
32+
public ArrayWrapper(Array<?> a) {
3333
_a = a;
3434
}
3535

@@ -44,5 +44,5 @@ public void readFields(DataInput in) throws IOException {
4444
int s = in.readInt();
4545
_a = ArrayFactory.read(in, s);
4646
}
47-
47+
4848
}

‎src/main/java/org/apache/sysds/runtime/frame/data/columns/BooleanArray.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
public class BooleanArray extends ABooleanArray {
3737
protected boolean[] _data;
3838

39-
private BooleanArray(int nRow){
39+
private BooleanArray(int nRow) {
4040
this(new boolean[nRow]);
4141
}
4242

‎src/main/java/org/apache/sysds/runtime/frame/data/columns/CharArray.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,6 @@ public boolean possiblyContainsNaN() {
381381
return false;
382382
}
383383

384-
385384
@Override
386385
protected void mergeRecodeMaps(Map<Character, Integer> target, Map<Character, Integer> from) {
387386
final List<Character> fromEntriesOrdered = new ArrayList<>(Collections.nCopies(from.size(), null));

‎src/main/java/org/apache/sysds/runtime/frame/data/columns/DoubleArray.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ public double[] minMax(int l, int u) {
467467
protected void mergeRecodeMaps(Map<Double, Integer> target, Map<Double, Integer> from) {
468468
final double[] fromEntriesOrdered = new double[from.size()];
469469
for(Map.Entry<Double, Integer> e : from.entrySet())
470-
fromEntriesOrdered[e.getValue() - 1] = e.getKey();
470+
fromEntriesOrdered[e.getValue() - 1] = e.getKey();
471471
int id = target.size();
472472
for(double e : fromEntriesOrdered) {
473473
if(target.putIfAbsent(e, id) == null)

‎src/main/java/org/apache/sysds/runtime/frame/data/columns/FloatArray.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,12 +412,11 @@ protected int setAndAddToDict(Map<Float, Integer> rcd, AMapToData m, int i, Inte
412412
return id;
413413
}
414414

415-
416415
@Override
417416
protected void mergeRecodeMaps(Map<Float, Integer> target, Map<Float, Integer> from) {
418417
final float[] fromEntriesOrdered = new float[from.size()];
419418
for(Map.Entry<Float, Integer> e : from.entrySet())
420-
fromEntriesOrdered[e.getValue() - 1] = e.getKey();
419+
fromEntriesOrdered[e.getValue() - 1] = e.getKey();
421420
int id = target.size();
422421
for(float e : fromEntriesOrdered) {
423422
if(target.putIfAbsent(e, id) == null)

‎src/main/java/org/apache/sysds/runtime/frame/data/columns/HashLongArray.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -434,27 +434,26 @@ public boolean possiblyContainsNaN() {
434434
return false;
435435
}
436436

437-
@Override
437+
@Override
438438
protected int addValRecodeMap(Map<Object, Integer> map, int id, int i) {
439439
Long val = Long.valueOf(getLong(i));
440440
Integer v = map.putIfAbsent(val, id);
441441
if(v == null)
442442
id++;
443-
443+
444444
return id;
445445
}
446446

447-
@Override
448-
public void setM(Map<Object, Integer> map, AMapToData m, int i){
447+
@Override
448+
public void setM(Map<Object, Integer> map, AMapToData m, int i) {
449449
m.set(i, map.get(Long.valueOf(getLong(i))) - 1);
450450
}
451451

452-
@Override
452+
@Override
453453
public void setM(Map<Object, Integer> map, int si, AMapToData m, int i) {
454454
m.set(i, map.get(Long.valueOf(getLong(i))) - 1);
455455
}
456456

457-
458457
@Override
459458
protected void mergeRecodeMaps(Map<Object, Integer> target, Map<Object, Integer> from) {
460459
final long[] fromEntriesOrdered = new long[from.size()];

‎src/main/java/org/apache/sysds/runtime/frame/data/columns/LongArray.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
public class LongArray extends Array<Long> {
3838
private long[] _data;
3939

40-
4140
private LongArray(int nRow) {
4241
this(new long[nRow]);
4342
}
@@ -157,7 +156,6 @@ protected static LongArray read(DataInput in, int nRow) throws IOException {
157156
return arr;
158157
}
159158

160-
161159
@Override
162160
public Array<Long> clone() {
163161
return new LongArray(Arrays.copyOf(_data, _size));
@@ -323,7 +321,7 @@ public static long parseLong(String s) {
323321
if(s == null || s.isEmpty())
324322
return 0;
325323
try {
326-
Long v = Long.parseLong(s);
324+
Long v = Long.parseLong(s);
327325
return v;
328326
}
329327
catch(NumberFormatException e) {
@@ -388,12 +386,11 @@ public boolean possiblyContainsNaN() {
388386
return false;
389387
}
390388

391-
392389
@Override
393390
protected void mergeRecodeMaps(Map<Long, Integer> target, Map<Long, Integer> from) {
394391
final long[] fromEntriesOrdered = new long[from.size()];
395392
for(Map.Entry<Long, Integer> e : from.entrySet())
396-
fromEntriesOrdered[e.getValue() - 1] = e.getKey();
393+
fromEntriesOrdered[e.getValue() - 1] = e.getKey();
397394
int id = target.size();
398395
for(long e : fromEntriesOrdered) {
399396
if(target.putIfAbsent(e, id) == null)

‎src/main/java/org/apache/sysds/runtime/frame/data/columns/OptionalArray.java‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -472,43 +472,6 @@ public boolean possiblyContainsNaN() {
472472
return true;
473473
}
474474

475-
// @Override
476-
// @SuppressWarnings("unchecked")
477-
// protected Map<T, Long> createRecodeMap(int estimate) {
478-
// if(getValueType() == ValueType.BOOLEAN) {
479-
// // shortcut for boolean arrays, since we only
480-
// // need to encounter the first two false and true values.
481-
// Map<T, Long> map = new HashMap<>(estimate);
482-
// long id = 1;
483-
// for(int i = 0; i < size() && id <= 2; i++)
484-
// id = addValRecodeMap(map, id, i);
485-
486-
// return map;
487-
// }
488-
// else if(getValueType() == ValueType.HASH32){
489-
// Map<Object, Long> map = new HashMap<>(estimate);
490-
// HashIntegerArray b = (HashIntegerArray)_a;
491-
// long id = 1;
492-
// for(int i = 0; i < size(); i++){
493-
// if(_n.get(i))
494-
// id = b.addValRecodeMap(map, id, i);
495-
// }
496-
// return (Map<T, Long>)map;
497-
// }
498-
// else if(getValueType() == ValueType.HASH64){
499-
// Map<Object, Long> map = new HashMap<>(estimate);
500-
// HashLongArray b = (HashLongArray)_a;
501-
// long id = 1;
502-
// for(int i = 0; i < size(); i++){
503-
// if(_n.get(i))
504-
// id = b.addValRecodeMap(map, id, i);
505-
// }
506-
// return (Map<T, Long>)map;
507-
// }
508-
// else
509-
// return super.createRecodeMap(estimate);
510-
// }
511-
512475
@Override
513476
public void setM(Map<T, Integer> map, AMapToData m, int i) {
514477
_a.setM(map, m, i);

‎src/main/java/org/apache/sysds/runtime/frame/data/columns/RaggedArray.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,6 @@ protected Array<Boolean> changeTypeBoolean(Array<Boolean> retA, int l, int u) {
268268
return _a.changeTypeBoolean(retA, l, u);
269269
}
270270

271-
// @Override
272-
// protected Array<Double> changeTypeDouble() {
273-
// return _a.changeTypeDouble();
274-
// }
275-
276271
@Override
277272
protected Array<Double> changeTypeDouble(Array<Double> retA, int l, int u) {
278273
return _a.changeTypeDouble(retA, l, u);

0 commit comments

Comments
 (0)