Code cleanup

This commit is contained in:
Ilkka Seppälä
2020-07-30 17:25:32 +03:00
parent 5381387026
commit 981985531d
243 changed files with 1157 additions and 1166 deletions

View File

@@ -52,19 +52,19 @@ public class ArrayTransposeMaster extends Master {
@Override
ArrayResult aggregateData() {
// number of rows in final result is number of rows in any of obtained results from workers
int rows = ((ArrayResult) this.getAllResultData()
.get(this.getAllResultData().keys().nextElement())).data.length;
int rows = this.getAllResultData()
.get(this.getAllResultData().keys().nextElement()).data.length;
int columns =
0; //number of columns is sum of number of columns in all results obtained from workers
for (Enumeration<Integer> e = this.getAllResultData().keys(); e.hasMoreElements(); ) {
columns += ((ArrayResult) this.getAllResultData().get(e.nextElement())).data[0].length;
columns += this.getAllResultData().get(e.nextElement()).data[0].length;
}
int[][] resultData = new int[rows][columns];
int columnsDone = 0; //columns aggregated so far
for (int i = 0; i < this.getExpectedNumResults(); i++) {
//result obtained from ith worker
int[][] work =
((ArrayResult) this.getAllResultData().get(this.getWorkers().get(i).getWorkerId())).data;
this.getAllResultData().get(this.getWorkers().get(i).getWorkerId()).data;
for (int m = 0; m < work.length; m++) {
//m = row number, n = columns number
for (int n = 0; n < work[0].length; n++) {

View File

@@ -40,7 +40,7 @@ public abstract class Master {
private final int numOfWorkers;
private final ArrayList<Worker> workers;
private int expectedNumResults;
private Hashtable<Integer, Result> allResultData;
private final Hashtable<Integer, Result> allResultData;
private Result finalResult;
Master(int numOfWorkers) {