eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 06:18:12 +00:00
Code Activity

bug 3484 completed and working version

Browse Source
This commit is contained in:
Joshua Schulz committed 2017-11-24 07:37:51 +01:00
1 parent ec8301d745
commit be2ef242aa
2 files changed
+25 -117
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateTest.java
+9 -17
View File
@@ -2,23 +2,16 @@ package com.sap.see.pairinglist.test;
import static org.junit.Assert.assertArrayEquals;
import java.util.Arrays;
import org.junit.Test;
import com.sap.sse.pairinglist.impl.PairingListTemplateFactoryImpl;
import com.sap.sse.pairinglist.impl.PairingListTemplateImpl;
import junit.framework.Assert;
public class PairingListTemplateTest extends PairingListTemplateImpl {
PairingListTemplateFactoryImpl factory;
public PairingListTemplateTest() {
super(new PairingFrameProviderTest(15, 3, 18));
System.out.println(Arrays.deepToString(this.getPairingListTemplate()));
System.out.println(getQuality());
}
@Test
@@ -58,11 +51,7 @@ public class PairingListTemplateTest extends PairingListTemplateImpl {
final int groups = 3;
final int competitors = 18;
factory = new PairingListTemplateFactoryImpl();
int[][] plTemplate = factory
.getOrCreatePairingListTemplate(new PairingFrameProviderTest(flights, groups, competitors))
.getPairingListTemplate();
int[][] plTemplate = this.createPairingListTemplate(flights, groups, competitors);
int[][] associations = new int[competitors][competitors];
associations = this.incrementAssociations(plTemplate, associations);
@@ -87,9 +76,10 @@ public class PairingListTemplateTest extends PairingListTemplateImpl {
for (int i = 0; i < tests; i++) {
long time = System.currentTimeMillis();
this.createPairingListTemplate(10, 3, 30);
this.createPairingListTemplate(15, 3, 18);
time = System.currentTimeMillis() - time;
System.out.println(time);
a[i] = time;
}
@@ -97,10 +87,10 @@ public class PairingListTemplateTest extends PairingListTemplateImpl {
for (int i = 0; i < tests; i++) {
sum += a[i];
}
double average = sum / tests;
double average = sum / tests+1;
System.out.println("Average Time: " + (average / 1000) + "s");
if (average > 8000) {
if (average > 10000) {
Assert.fail("The calculation of Pairing Lists took longer than expected!");
}
}
@@ -118,7 +108,7 @@ public class PairingListTemplateTest extends PairingListTemplateImpl {
for (double quality: results) {
sum += quality;
}
System.out.println("Average Quality:"+sum / count);
Assert.assertEquals(0.574, sum/count, 0.01);
}
@Test
@@ -173,7 +163,9 @@ public class PairingListTemplateTest extends PairingListTemplateImpl {
{3,4,5,6,7,8},
{3,4,5,6,7,9}
};
System.out.println(Arrays.deepToString(radixSort(allSeeds, 18)));
allSeeds=radixSort(allSeeds, 18);
int[][] expectedResult={{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 7, 5}, {3, 4, 5, 6, 7, 8}, {3, 4, 5, 6, 7, 9}, {17, 12, 14, 16, 3, 4}};
assertArrayEquals(allSeeds, expectedResult);
}
}
java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateImpl.java
+16 -100
View File
@@ -20,11 +20,6 @@ public class PairingListTemplateImpl implements PairingListTemplate {
private final double standardDev;
private final ExecutorService executorService = ThreadPoolUtil.INSTANCE
.getDefaultBackgroundTaskThreadPoolExecutor();
private final int maxConstantFlights;
private final int prefixSeedCount;
private final int suffixSeedCount;
private final int MAX_TASKS = 1024;
private final int iterations;
public PairingListTemplateImpl(PairingFrameProvider pairingFrameProvider) {
@@ -34,28 +29,11 @@ public class PairingListTemplateImpl implements PairingListTemplate {
public PairingListTemplateImpl(PairingFrameProvider pairingFrameProvider, int iterations) {
this.iterations = iterations;
if (0.9 * pairingFrameProvider.getFlightsCount() > 10) {
this.maxConstantFlights = 10;
this.prefixSeedCount = 2;
} else if (pairingFrameProvider.getFlightsCount() > 4) {
this.maxConstantFlights = (int) ((pairingFrameProvider.getFlightsCount()) * 0.5);
this.prefixSeedCount = (int) (Math.pow(this.MAX_TASKS, (1.0 / maxConstantFlights)));
} else {
maxConstantFlights = 0;
prefixSeedCount = 0;
}
this.suffixSeedCount = (int) Math.pow((iterations / this.MAX_TASKS),
1.0 / (pairingFrameProvider.getFlightsCount() - this.maxConstantFlights));
if (this.checkValues(pairingFrameProvider.getFlightsCount(), pairingFrameProvider.getGroupsCount(),
pairingFrameProvider.getCompetitorsCount())) {
if (true) {
this.pairingListTemplate = this.createPairingListTemplate(pairingFrameProvider.getFlightsCount(),
pairingFrameProvider.getGroupsCount(), pairingFrameProvider.getCompetitorsCount());
}
this.pairingListTemplate = this.createPairingListTemplate(pairingFrameProvider.getFlightsCount(),
pairingFrameProvider.getGroupsCount(), pairingFrameProvider.getCompetitorsCount());
this.standardDev = this.calcStandardDev(incrementAssociations(this.pairingListTemplate,
new int[pairingFrameProvider.getCompetitorsCount()][pairingFrameProvider.getCompetitorsCount()]));
} else {
@@ -163,21 +141,12 @@ public class PairingListTemplateImpl implements PairingListTemplate {
}
}
//bestPLT = this.improveAssignment(bestPLT, flightCount, groupCount, competitors);
//bestPLT = this.improveAssignmentChanges(bestPLT, flightCount, competitors);
System.out.println(Arrays.toString(getSeeds(bestPLT)));
bestPLT = this.improveAssignment(bestPLT, flightCount, groupCount, competitors);
bestPLT = this.improveAssignmentChanges(bestPLT, flightCount, competitors);
futures.clear();
return bestPLT;
}
private int[] getSeeds(int[][] bestPLT) {
int[] seeds = new int[18];
for (int i = 0; i < bestPLT.length; i += 3) {
seeds[i / 3] = bestPLT[i][0];
}
return seeds;
}
private ArrayList<int[][]> divideSeeds(int i,int[][] allSeeds) {
int cut=0;
@@ -237,18 +206,12 @@ public class PairingListTemplateImpl implements PairingListTemplate {
* count of competitors
* @return int array of random competitors
*/
private int[] generateSeeds(int flights, int competitors) {
return this.generateSeeds(flights, competitors, this.prefixSeedCount);
}
private int[] generateSeeds(int flights, int competitors, int count) {
int[] seeds=new int[count];
Arrays.fill(seeds, 0);
for(int x=0;x<seeds.length;x++){
int random=this.getRandomIntegerBetween(0, competitors - 1);
// while(this.contains(seeds, random)) {
// random=this.getRandomIntegerBetween(0, competitors - 1);
// }
seeds[x] = random;
}
return seeds;
@@ -280,56 +243,6 @@ public class PairingListTemplateImpl implements PairingListTemplate {
}
}
/**
* Creates constant flights.
*
* Recursive method, called in createPairingListTemplate(). Method is described in its javadoc.
*
* @param flights count of flights
* @param groups count of groups
* @param competitors count of competitors
* @param associations
* @param currentPLT
* @param seeds
* @return <code>ArrayList</code> of <code>Futures</code> in which the result of a single task is saved
*/
// private ArrayList<Future<int[][]>> createPrefix(int flights, int groups, int competitors, int[][] associations,
// int[][]currentPLT, int[] seeds, ArrayList<Future<int[][]>> futures, int level) {
//
// if (level < this.maxConstantFlights) {
// // calculate Flights for current recurrence level
// for (int seedIndex = 0; seedIndex < seeds.length; seedIndex++) {
// int[][] temp = this.createFlight(groups, competitors, associations, seeds[seedIndex]);
// for (int m = 0; m < groups; m++) {
// System.arraycopy(temp[m], 0, currentPLT[level * groups + m], 0, competitors / groups);
// }
// level++;
// associations = this.incrementAssociations(temp, associations);
// this.createPrefix(flights, groups, competitors, associations, currentPLT, this.generateSeeds(flights, competitors),
// futures, level);
// level--;
// associations = this.decrementAssociations(temp, associations);
// }
//
// // reset last recurrence step
// for (int i = level * groups; i < level * groups + groups; i++) {
// Arrays.fill(currentPLT[i], 0);
// }
//
// } else {
// // Task start
// Future<int[][]> future = executorService.submit((new SuffixCreationTask(flights, groups, competitors, currentPLT, associations, seeds.length)));
// futures.add(future);
//
// // reset last recurrence step
// for (int i = maxConstantFlights * groups - 1; i >= maxConstantFlights * groups - groups; i--) {
// Arrays.fill(currentPLT[i], 0);
// }
// }
// return futures;
// }
/**
* Generates a single flight, that depends on a specific seed.
*
@@ -539,6 +452,15 @@ public class PairingListTemplateImpl implements PairingListTemplate {
}
return bestPLT;
}
/**
* Improves the Assignment changes between two flights by switching the groups inside a flight.
* Competitors and there assignment will not be changed.
* @param pairingList complete pairingListTemplate which needs to be improved
* @param flights number of flights which was used to generate the pairingListTemplate
* @param competitors number of competitors which was used to generate the pairingListTemplate
*
* @return the improved pairingListTemplate
*/
private int[][] improveAssignmentChanges(int[][] pairingList, int flights, int competitors) {
int boatChanges[] = new int[flights-1];
@@ -568,9 +490,6 @@ public class PairingListTemplateImpl implements PairingListTemplate {
boatChanges[i - 1] = groupNext.length - bestMatch;
}
// System.out.println(Arrays.toString(boatChanges));
return pairingList;
}
@@ -685,9 +604,6 @@ public class PairingListTemplateImpl implements PairingListTemplate {
}
/**
* get decleard field
* set accessable true
*
* Creates a matrix that describes how often the team competes against each other. Its dimensions are
* <code>associations[competitors][competitors]</code>, e.g.:
*
@@ -750,8 +666,8 @@ public class PairingListTemplateImpl implements PairingListTemplate {
int k = associations[0][0], // first value of association array
n = 0, // count of elements in association array
exp = 0, //
exp2 = 0; //
exp = 0,
exp2 = 0;
for (int i = 0; i < associations.length; i++) {
for (int j = 0; j < associations[0].length; j++) {