fixed multiplyFlights

This commit is contained in:
Raphael Müßeler committed 2017-12-05 10:31:27 +01:00
1 parent fb73a5ee39
commit f5d76e754b
2 files changed
+7 -3

No files matched your search

@@ -64,7 +64,8 @@ public class PairingListTemplateFactoryTest {
@Test
public void testGeneration() {
PairingListTemplateFactoryImpl factoryImpl = new PairingListTemplateFactoryImpl();
PairingListTemplate example1 = factoryImpl.getOrCreatePairingListTemplate(new PairingFrameProviderTest(15, 3, 18),0);
PairingListTemplate example1 = factoryImpl.getOrCreatePairingListTemplate(new PairingFrameProviderTest(15, 3, 18),3);
System.out.println(Arrays.deepToString(example1.getPairingListTemplate()));
PairingListTemplate example6 = factoryImpl.getOrCreatePairingListTemplate(new PairingFrameProviderTest(15, 3, 14),0);
PairingListTemplate example2 = factoryImpl.getOrCreatePairingListTemplate(new PairingFrameProviderTest(100, 6, 18),0);
PairingListTemplate example3 = factoryImpl.getOrCreatePairingListTemplate(new PairingFrameProviderTest(10, 3, 30),0);
@@ -564,9 +564,12 @@ public class PairingListTemplateImpl implements PairingListTemplate {
private int[][] multiplyFlights(int[][] bestPLT, int flightCount, int groupCount, int competitorCount) {
int[][] result = new int[(flightCount * groupCount) * (flightMultiplier + 1)][competitorCount / groupCount];
for (int i = 0; i < bestPLT.length; i++) {
for (int flightIndex = 0; flightIndex < flightCount; flightIndex++) {
for (int x = 0; x <= flightMultiplier; x++) {
result[i * (flightMultiplier + 1) + x] = bestPLT[i];
for (int groupIndex = 0; groupIndex < groupCount; groupIndex++) {
result[(flightIndex * groupCount * (flightMultiplier + 1) + groupIndex) + x * groupCount] = bestPLT[flightIndex * groupCount + groupIndex];
}
}
}
return result;