Skip to content

Commit

Permalink
Renames TableBuilderAbstract.addColumnDataFunction to addColDataFunction
Browse files Browse the repository at this point in the history
Signed-off-by: Manoel Campos <manoelcampos@gmail.com>
  • Loading branch information
manoelcampos committed Nov 16, 2022
1 parent f2c2228 commit 7849690
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,25 +70,25 @@ public CloudletsTableBuilder(final List<? extends Cloudlet> list, final Table ta
@Override
protected void createTableColumns() {
final String ID = "ID";
addColumnDataFunction(getTable().addColumn("Cloudlet", ID), Identifiable::getId);
addColumnDataFunction(getTable().addColumn("Status "), cloudlet -> cloudlet.getStatus().name());
addColumnDataFunction(getTable().addColumn("DC", ID), cloudlet -> cloudlet.getVm().getHost().getDatacenter().getId());
addColumnDataFunction(getTable().addColumn("Host", ID), cloudlet -> cloudlet.getVm().getHost().getId());
addColumnDataFunction(getTable().addColumn("Host PEs ", CPU_CORES), cloudlet -> cloudlet.getVm().getHost().getWorkingPesNumber());
addColumnDataFunction(getTable().addColumn("VM", ID), cloudlet -> cloudlet.getVm().getId());
addColumnDataFunction(getTable().addColumn("VM PEs ", CPU_CORES), cloudlet -> cloudlet.getVm().getNumberOfPes());
addColumnDataFunction(getTable().addColumn("CloudletLen", "MI"), Cloudlet::getLength);
addColumnDataFunction(getTable().addColumn("FinishedLen", "MI"), Cloudlet::getFinishedLengthSoFar);
addColumnDataFunction(getTable().addColumn("CloudletPEs", CPU_CORES), Cloudlet::getNumberOfPes);
addColDataFunction(getTable().addColumn("Cloudlet", ID), Identifiable::getId);
addColDataFunction(getTable().addColumn("Status "), cloudlet -> cloudlet.getStatus().name());
addColDataFunction(getTable().addColumn("DC", ID), cloudlet -> cloudlet.getVm().getHost().getDatacenter().getId());
addColDataFunction(getTable().addColumn("Host", ID), cloudlet -> cloudlet.getVm().getHost().getId());
addColDataFunction(getTable().addColumn("Host PEs ", CPU_CORES), cloudlet -> cloudlet.getVm().getHost().getWorkingPesNumber());
addColDataFunction(getTable().addColumn("VM", ID), cloudlet -> cloudlet.getVm().getId());
addColDataFunction(getTable().addColumn("VM PEs ", CPU_CORES), cloudlet -> cloudlet.getVm().getNumberOfPes());
addColDataFunction(getTable().addColumn("CloudletLen", "MI"), Cloudlet::getLength);
addColDataFunction(getTable().addColumn("FinishedLen", "MI"), Cloudlet::getFinishedLengthSoFar);
addColDataFunction(getTable().addColumn("CloudletPEs", CPU_CORES), Cloudlet::getNumberOfPes);

final var col1 = getTable().addColumn("StartTime", SECONDS).setFormat(TIME_FORMAT);
addColumnDataFunction(col1, Cloudlet::getExecStartTime);
addColDataFunction(col1, Cloudlet::getExecStartTime);

final var col2 = getTable().addColumn("FinishTime", SECONDS).setFormat(TIME_FORMAT);
addColumnDataFunction(col2, cl -> roundTime(cl, cl.getFinishTime()));
addColDataFunction(col2, cl -> roundTime(cl, cl.getFinishTime()));

final var col3 = getTable().addColumn("ExecTime", SECONDS).setFormat(TIME_FORMAT);
addColumnDataFunction(col3, cl -> roundTime(cl, cl.getActualCpuTime()));
addColDataFunction(col3, cl -> roundTime(cl, cl.getActualCpuTime()));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,24 @@ public HostHistoryTableBuilder(final Host host) {
@Override
protected void createTableColumns() {
TableColumn col = getTable().addColumn("Time ").setFormat("%5.0f");
addColumnDataFunction(col, HostStateHistoryEntry::time);
addColDataFunction(col, HostStateHistoryEntry::time);

final String format = "%9.0f";
col = getTable().addColumn("Requested").setFormat(format);
addColumnDataFunction(col, HostStateHistoryEntry::requestedMips);
addColDataFunction(col, HostStateHistoryEntry::requestedMips);

col = getTable().addColumn("Allocated").setFormat(format);
addColumnDataFunction(col, HostStateHistoryEntry::allocatedMips);
addColDataFunction(col, HostStateHistoryEntry::allocatedMips);

col = getTable().addColumn("Used").setFormat("%3.0f%%");
addColumnDataFunction(col, history -> history.percentUsage()*100);
addColDataFunction(col, history -> history.percentUsage()*100);

addColumnDataFunction(getTable().addColumn("Host Active"), HostStateHistoryEntry::active);
addColDataFunction(getTable().addColumn("Host Active"), HostStateHistoryEntry::active);

col = getTable().addColumn("Host Total MIPS").setFormat(format);
addColumnDataFunction(col, history -> host.getTotalMipsCapacity());
addColDataFunction(col, history -> host.getTotalMipsCapacity());

col = getTable().addColumn("Host Total Usage").setFormat("%5.1f%%");
addColumnDataFunction(col, history -> history.allocatedMips()/host.getTotalMipsCapacity()*100);
addColDataFunction(col, history -> history.allocatedMips()/host.getTotalMipsCapacity()*100);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ protected void addDataToRow(final T object, final List<Object> row) {
.forEach(col -> row.add(columnsDataFunctions.get(col).apply(object)));
}

protected TableBuilderAbstract<T> addColumnDataFunction(final TableColumn col, final Function<T, Object> function){
protected TableBuilderAbstract<T> addColDataFunction(final TableColumn col, final Function<T, Object> function){
columnsDataFunctions.put(requireNonNull(col), requireNonNull(function));
return this;
}
Expand Down

0 comments on commit 7849690

Please sign in to comment.