Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Datavec bulk operation (#9075) 

* Bulk operation can be used instead of iteration inspection

Signed-off-by: Dariusz Zbyrad <dariusz.zbyrad@gmail.com>

* Redundant 'Collection.addAll()' call inspection

Signed-off-by: Dariusz Zbyrad <dariusz.zbyrad@gmail.com>
master
dariuszzbyrad 2020-08-28 00:59:14 +02:00 committed by GitHub
parent 8ff0aa8ddf
commit 6afec82181
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
datavec/datavec-api/src/main/java/org/datavec/api/records/reader/impl/csv/CSVVariableSlidingWindowRecordReader.java
View File

@ -128,9 +128,7 @@ public class CSVVariableSlidingWindowRecordReader extends CSVRecordReader implem
} }
List<List<Writable>> sequence = new ArrayList<>(); List<List<Writable>> sequence = new ArrayList<>();
for(List<Writable> line : queue) { sequence.addAll(queue);
sequence.add(line);
}
if(exhausted && queue.size()==1) if(exhausted && queue.size()==1)
queue.pollLast(); queue.pollLast();

3
datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/window/OverlappingTimeWindowFunction.java
View File

@ -200,9 +200,8 @@ public class OverlappingTimeWindowFunction implements WindowFunction {
public Schema transform(Schema inputSchema) { public Schema transform(Schema inputSchema) {
if (!addWindowStartTimeColumn && !addWindowEndTimeColumn) if (!addWindowStartTimeColumn && !addWindowEndTimeColumn)
return inputSchema; return inputSchema;
List<ColumnMetaData> newMeta = new ArrayList<>();
newMeta.addAll(inputSchema.getColumnMetaData()); List<ColumnMetaData> newMeta = new ArrayList<>(inputSchema.getColumnMetaData());
if (addWindowStartTimeColumn) { if (addWindowStartTimeColumn) {
newMeta.add(new TimeMetaData("windowStartTime")); newMeta.add(new TimeMetaData("windowStartTime"));

3
datavec/datavec-api/src/main/java/org/datavec/api/transform/sequence/window/TimeWindowFunction.java
View File

@ -165,9 +165,8 @@ public class TimeWindowFunction implements WindowFunction {
public Schema transform(Schema inputSchema) { public Schema transform(Schema inputSchema) {
if (!addWindowStartTimeColumn && !addWindowEndTimeColumn) if (!addWindowStartTimeColumn && !addWindowEndTimeColumn)
return inputSchema; return inputSchema;
List<ColumnMetaData> newMeta = new ArrayList<>();
newMeta.addAll(inputSchema.getColumnMetaData()); List<ColumnMetaData> newMeta = new ArrayList<>(inputSchema.getColumnMetaData());
if (addWindowStartTimeColumn) { if (addWindowStartTimeColumn) {
newMeta.add(new TimeMetaData("windowStartTime")); newMeta.add(new TimeMetaData("windowStartTime"));

3
datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/column/AddConstantColumnTransform.java
View File

@ -53,8 +53,7 @@ public class AddConstantColumnTransform implements Transform {
@Override @Override
public Schema transform(Schema inputSchema) { public Schema transform(Schema inputSchema) {
List<ColumnMetaData> outMeta = new ArrayList<>(); List<ColumnMetaData> outMeta = new ArrayList<>(inputSchema.getColumnMetaData());
outMeta.addAll(inputSchema.getColumnMetaData());
ColumnMetaData newColMeta = newColumnType.newColumnMetaData(newColumnName); ColumnMetaData newColMeta = newColumnType.newColumnMetaData(newColumnName);
outMeta.add(newColMeta); outMeta.add(newColMeta);

3
datavec/datavec-api/src/main/java/org/datavec/api/transform/transform/string/ConcatenateStringColumns.java
View File

@ -75,8 +75,7 @@ public class ConcatenateStringColumns extends BaseTransform implements ColumnOp
} }
} }
List<ColumnMetaData> outMeta = new ArrayList<>(); List<ColumnMetaData> outMeta = new ArrayList<>(inputSchema.getColumnMetaData());
outMeta.addAll(inputSchema.getColumnMetaData());
ColumnMetaData newColMeta = ColumnType.String.newColumnMetaData(newColumnName); ColumnMetaData newColMeta = ColumnType.String.newColumnMetaData(newColumnName);
outMeta.add(newColMeta); outMeta.add(newColMeta);

3
datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java
View File

@ -279,8 +279,7 @@ public class TestTransforms extends BaseND4JTest {
Assert.assertEquals(outputColumns, newSchema.getColumnNames()); Assert.assertEquals(outputColumns, newSchema.getColumnNames());
List<Writable> input = new ArrayList<>(); List<Writable> input = new ArrayList<>();
for (Writable value : COLUMN_VALUES) input.addAll(COLUMN_VALUES);
input.add(value);
transform.setInputSchema(schema); transform.setInputSchema(schema);
List<Writable> transformed = transform.map(input); List<Writable> transformed = transform.map(input);

3
datavec/datavec-arrow/src/main/java/org/datavec/arrow/recordreader/ArrowWritableRecordBatch.java
View File

@ -243,8 +243,7 @@ public class ArrowWritableRecordBatch extends AbstractWritableRecordBatch implem
public List<List<Writable>> toArrayList() { public List<List<Writable>> toArrayList() {
List<List<Writable>> ret = new ArrayList<>(); List<List<Writable>> ret = new ArrayList<>();
for(int i = 0; i < size(); i++) { for(int i = 0; i < size(); i++) {
List<Writable> add = new ArrayList<>(); List<Writable> add = new ArrayList<>(get(i));
add.addAll(get(i));
ret.add(add); ret.add(add);
} }

3
datavec/datavec-local/src/main/java/org/datavec/local/transforms/sequence/LocalGroupToSequenceFunction.java
View File

@ -40,8 +40,7 @@ public class LocalGroupToSequenceFunction implements Function<List<List<Writable
public List<List<Writable>> apply(List<List<Writable>> lists) { public List<List<Writable>> apply(List<List<Writable>> lists) {
List<List<Writable>> list = new ArrayList<>(); List<List<Writable>> list = new ArrayList<>();
for (List<Writable> writables : lists) list.addAll(lists);
list.add(writables);
Collections.sort(list, comparator); Collections.sort(list, comparator);