Merge branch 'bug3484' of ssh://trac@sapsailing.com/home/trac/git into

bug3484

Conflicts:
	java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateTest.java
	java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateImpl.java

java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/PairingListRegattaAdapter.java

@@ -1,9 +1,6 @@
 package com.sap.sailing.domain.base;
+import com.sap.sse.pairinglist.CompetitionFormat; 
 
-import com.sap.sse.pairinglist.PairingFrameProvider;
+public interface PairingListRegattaAdapter<Flight, Group, Competitor> extends CompetitionFormat<Flight, Group, Competitor> {
 
-public interface PairingListRegattaAdapter<Flight, Group, Competitor> extends PairingFrameProvider {
-
-    
-    
 }

java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingFrameProviderTest.java

@@ -3,7 +3,7 @@ package com.sap.see.pairinglist.test;
 import com.sap.sse.pairinglist.PairingFrameProvider;
 
 /**
- * This test class is used for reproducing a PairingFrameProvider
+ * This test class is used for test generations of PairingLists
  * @author D070264
  *
  */

java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateFactoryTest.java

@@ -13,9 +13,12 @@ public class PairingListTemplateFactoryTest extends PairingListTemplateFactoryIm
     @Test
     public void testGeneratePairingListTemplate() {
         PairingListTemplate testTemplate = generatePairingList(new PairingFrameProviderTest(15, 3, 18));
+        //PairingListTemplate testTemplate = generatePairingList(new PairingFrameProviderTest(45, 6, 18));
+        //PairingListTemplate testTemplate = generatePairingList(new PairingFrameProviderTest(10, 3, 30));
         assertNotNull(testTemplate);
-        System.out.println(Arrays.deepToString(testTemplate.getPairingListTemplate()));
+        for(int[] row : testTemplate.getPairingListTemplate()) {
+            System.out.println(Arrays.toString(row));
+        }
         System.out.println(testTemplate.getQuality());
     }
-
 }

java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateTest.java

@@ -1,6 +1,6 @@
 package com.sap.see.pairinglist.test;
 
-import static org.junit.Assert.assertArrayEquals; 
+import static org.junit.Assert.assertArrayEquals;  
 import static org.junit.Assert.fail;
 
 import java.util.Arrays;
@@ -10,18 +10,17 @@ import static org.junit.Assert.assertNotNull;
 import org.junit.Before;
 import org.junit.Test;
 import com.sap.sse.pairinglist.impl.PairingListTemplateImpl;
-import com.sap.sse.pairinglist.impl.PairingListTemplateImpl;
-
 import junit.framework.Assert;
 
 public class PairingListTemplateTest extends PairingListTemplateImpl{
    
     @Before
     public void init() {
+       // create(15, 3, 18,10000); 
         // creating pairing list template
-
        // this.create(15, 3, 18,10000);
 
+
     }
   
   
@@ -80,6 +79,7 @@ public class PairingListTemplateTest extends PairingListTemplateImpl{
         assertArrayEquals(currentAssociations[6],associationRow[1][0]);
     }
     
+
 //    @Test 
 //    public void testTeamAssociationCreation() {
 //        int[][] plTemplate = this.getPairingListTemplate();
@@ -157,5 +157,4 @@ public class PairingListTemplateTest extends PairingListTemplateImpl{
   public void test2(){
       createPairingListTemplate(15, 3, 18);
   }
-
 }

java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateFactoryImpl.java

@@ -44,7 +44,7 @@ public class PairingListTemplateFactoryImpl implements PairingListTemplateFactor
         Callable<PairingListTemplate> callable = new Callable<PairingListTemplate>() {
             @Override
             public PairingListTemplate call() throws Exception {
-                return new PairingListTemplateImpl(pairingFrameProvider, (1000000/threadPoolSize));
+                return new PairingListTemplateImpl(pairingFrameProvider, (10000/threadPoolSize));
             }
         };
 
@@ -76,5 +76,4 @@ public class PairingListTemplateFactoryImpl implements PairingListTemplateFactor
         }
         return currentBest;
     }
-
 }

java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateImpl.java

@@ -1,5 +1,7 @@
 package com.sap.sse.pairinglist.impl;
 
+import java.util.Arrays;
+import java.util.Collections;
 
 
 import java.util.ArrayList;
@@ -16,6 +18,7 @@ import com.sap.sse.util.ThreadPoolUtil;
 
 public class PairingListTemplateImpl implements PairingListTemplate{
 
+
     private int[][] pairingListTemplate;
     private double standardDev;
     private ExecutorService executorService= ThreadPoolUtil.INSTANCE.getDefaultBackgroundTaskThreadPoolExecutor();
@@ -243,7 +246,7 @@ public class PairingListTemplateImpl implements PairingListTemplate{
                 //first Flight
                 int[][] flightColumn = new int[groups][competitors / groups];
                 associationRow= setZero(associationRow);
-                int[] associationHigh = new int[competitors / groups - 1];
+                int[] associationHigh = new int[groups - 1];
                 flightColumn[0][0] = randomBW(1, competitors);
                 for (int zGroups = 1; zGroups <= (competitors / groups) - 1; zGroups++) {
                     int associationSum = Integer.MAX_VALUE;
@@ -311,15 +314,26 @@ public class PairingListTemplateImpl implements PairingListTemplate{
                 bestDev = this.calcStandardDev(currentAssociations);
             }
         }
-
-        for(int[] group : bestPLT) {
-            shuffle(group);
+        
+        for(int i = 0; i<bestPLT.length; i++) {
+            int[] group = bestPLT[i];
+            Integer[] nums = Arrays.stream(group).boxed().toArray(Integer[]::new);
+            //System.out.println(Arrays.toString(nums));
+            //List<Integer> groupShuffled = new ArrayList<>();
+            Collections.shuffle(Arrays.asList(nums));
+            System.out.println(Arrays.toString(nums));
+            bestPLT[i] = Arrays.stream(nums).mapToInt(Integer::intValue).toArray();
         }
 
         //bestPLT=this.improveAssignment(bestPLT, flights, groups, competitors);
         //bestPLT = this.improveAssignmentChanges(bestPLT, flights, competitors);
         this.standardDev = bestDev;
         this.pairingListTemplate=bestPLT;
+        
+        System.out.println(Arrays.deepToString(pairingListTemplate));
+
+
+        
         return bestPLT;
     }
 
@@ -331,7 +345,6 @@ public class PairingListTemplateImpl implements PairingListTemplate{
                 associations[group[i] - 1][i] += 1;
             }
         }
-
         return associations;
     }
 

java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateImpl_OLD.java

@@ -1,370 +0,0 @@
-package com.sap.sse.pairinglist.impl;
-
-
-import com.sap.sse.pairinglist.CompetitionFormat;
-import com.sap.sse.pairinglist.PairingFrameProvider;
-import com.sap.sse.pairinglist.PairingList;
-import com.sap.sse.pairinglist.PairingListTemplate;
-
-public class PairingListTemplateImpl_OLD implements PairingListTemplate{
-    
-    private int[][] pairingListTemplate;
-    private double standardDev;
-
-    public PairingListTemplateImpl_OLD() {
-
-    }
-
-    public PairingListTemplateImpl_OLD(PairingFrameProvider pairingFrameProvider) {
-        pairingListTemplate = new int[pairingFrameProvider.getGroupsCount()][pairingFrameProvider.getCompetitorsCount()/pairingFrameProvider.getGroupsCount()];
-        this.create(pairingFrameProvider.getFlightsCount(), pairingFrameProvider.getGroupsCount(), pairingFrameProvider.getCompetitorsCount());
-    }
-
-    public PairingListTemplateImpl_OLD(PairingFrameProvider pairingFrameProvider, int iterations) {
-        pairingListTemplate = new int[pairingFrameProvider.getGroupsCount()][pairingFrameProvider.getCompetitorsCount()/pairingFrameProvider.getGroupsCount()];
-        this.create(pairingFrameProvider.getFlightsCount(), pairingFrameProvider.getGroupsCount(), pairingFrameProvider.getCompetitorsCount(), iterations);
-    }
-
-
-    @Override
-    public double getQuality() {
-        return standardDev;
-    }
-
-    @Override
-    public <Flight, Group, Competitor> PairingList<Flight, Group, Competitor> createPairingList(
-            CompetitionFormat<Flight, Group, Competitor> competitionFormat) {
-        return null;
-    }
-
-    @Override
-    public int[][] getPairingListTemplate(){
-        return pairingListTemplate;
-    }
-
-    protected int[][] create(int flights, int groups, int competitors) {
-        return this.create(flights, groups, competitors, 1000000);
-    }
-
-    protected int[][] create(int flights, int groups, int competitors, int iterationCount) {
-        int[][] bestPLT = new int[groups][competitors / groups];
-
-        double bestDev = Double.POSITIVE_INFINITY;
-
-        for (int iteration = 0; iteration < iterationCount; iteration++) {
-            int[][] currentAssociations = new int[competitors][competitors];
-            int[][] currentPLT = new int[groups * flights][competitors / groups];
-            int[][][] associationRow = new int[groups][(competitors / groups) - 1][competitors];
-
-            for (int zFlight = 0; zFlight < flights; zFlight++) {
-
-                int[][] flightColumn = new int[groups][competitors / groups];
-                associationRow= setZero(associationRow);
-                int[] associationHigh = new int[competitors / groups - 1];
-                flightColumn[0][0] = randomBW(1, competitors);
-                for (int zGroups = 1; zGroups <= (competitors / groups) - 1; zGroups++) {
-                    int associationSum = Integer.MAX_VALUE;
-                    associationHigh[0] = flights + 1;
-                    associationRow=copyInto3rdDimension(competitors, currentAssociations, associationRow, flightColumn, zGroups,0);
-
-                    for (int comp = 1; comp <= competitors; comp++) {
-                        if ((sumOf3rdDimension(associationRow, 0, comp - 1) <= associationSum) &&
-                                !contains(flightColumn, comp) &&
-                                findMaxValue(associationRow, 0, comp - 1) <= associationHigh[0]) {
-                            flightColumn[0][zGroups] = comp;
-                            associationSum = sumOf3rdDimension(associationRow, 0, comp - 1);
-                            associationHigh[0] = findMaxValue(associationRow, 0, comp - 1);
-                        }
-                    }
-                }
-
-                for (int fleets = 1; fleets < groups - 1; fleets++) {
-                    for (int aux = 0; aux < competitors; aux++) {
-                        if (!contains(flightColumn, aux)) {
-                            flightColumn[fleets][0] = aux;
-                            break;
-                        }
-                    }
-
-                    for (int zGroups = 1; zGroups < (competitors / groups); zGroups++) {
-                        int associationSum = Integer.MAX_VALUE;
-                        associationHigh[fleets] = flights + 1;
-                        associationRow=copyInto3rdDimension(competitors, currentAssociations, associationRow, flightColumn, zGroups,fleets);
-
-                        for (int comp = 1; comp <= competitors; comp++) {
-                            if ((sumOf3rdDimension(associationRow, fleets, comp - 1) <= associationSum) &&
-                                    !contains(flightColumn, comp) &&
-                                    findMaxValue(associationRow, fleets, comp - 1) <= associationHigh[fleets]) {
-                                flightColumn[fleets][zGroups] = comp;
-                                associationSum = sumOf3rdDimension(associationRow, fleets, comp - 1);
-                                associationHigh[fleets] = findMaxValue(associationRow, fleets, comp - 1);
-
-                            }
-                        }
-                    }
-                }
-
-                for (int j = 0; j < (competitors / groups); j++) {
-                    for (int z = 1; z <= competitors; z++) {
-                        if (!contains(flightColumn, z)) {
-                            flightColumn[groups - 1][j] = z;
-                            break;
-                        }
-                    }
-                }
-
-                currentAssociations = this.getAssociationsFromPairingList(flightColumn, currentAssociations);
-                for (int m = 0; m < groups; m++) {
-                    System.arraycopy(getColumnIntArray(flightColumn, m), 0, currentPLT[(zFlight * groups) + m], 0, competitors / groups);
-                }
-            }
-            for (int j = 0; j < currentAssociations.length; j++) {
-                currentAssociations[j][j] = -1;
-            }
-            if (this.calcStandardDev(currentAssociations) < bestDev) {
-                bestPLT = currentPLT;
-                bestDev = this.calcStandardDev(currentAssociations);
-            }
-        }
-
-        for(int[] group : bestPLT) {
-            shuffle(group);
-        }
-
-        bestPLT=this.improveAssignment(bestPLT, flights, groups, competitors);
-        this.standardDev = bestDev;
-        this.pairingListTemplate=bestPLT;
-        return bestPLT;
-    }
-
-
-
-    protected int[][] getAssignmentAssociations(int[][] pairingList, int[][] associations) {
-        for (int[] group : pairingList) {
-            for (int i = 0; i < pairingList[0].length; i++) {
-                associations[group[i] - 1][i] += 1;
-            }
-        }
-
-        return associations;
-    }
-
-    protected int[][] improveAssignment(int[][] pairinglist,int flights, int groups, int competitors){
-        int[][] assignments= this.getAssignmentAssociations(pairinglist, new int[competitors][competitors/groups]);
-        double neededAssigments= flights/(competitors/groups);
-        double bestDev=Double.POSITIVE_INFINITY;
-        int[][] bestPLT=new int[flights*groups][competitors/groups];
-        for(int iteration=0;iteration<10;iteration++){
-            for(int zGroup=0;zGroup<assignments.length;zGroup++){
-                int[][] groupAssignments=new int[competitors/groups][competitors/groups];
-                for(int zPlace=0;zPlace<(competitors/groups);zPlace++){
-                    System.arraycopy(assignments[pairinglist[zGroup][zPlace]-1], 0, groupAssignments[zPlace], 0, (competitors/groups));
-                }
-                for(int zPlace=0;zPlace<competitors*50;zPlace++){
-                    int[] position=this.findWorstValue(groupAssignments,(int)neededAssigments);
-                    if(groupAssignments[position[0]][position[1]]>neededAssigments-1&&groupAssignments[position[0]][position[1]]<neededAssigments+1){
-                        break;
-                    }else if(groupAssignments[position[0]][position[1]]<neededAssigments){
-                        int temp=0;
-                        temp=pairinglist[zGroup][position[1]];
-                        pairinglist[zGroup][position[1]]=pairinglist[zGroup][position[0]];
-                        pairinglist[zGroup][position[0]]=temp;
-                        assignments=this.getAssignmentAssociations(pairinglist, new int[competitors][competitors/groups]);
-                        for(int x=0;x<(competitors/groups);x++){
-                            System.arraycopy(assignments[pairinglist[zGroup][x]-1], 0, groupAssignments[x], 0, (competitors/groups));
-                        }
-                    }else{
-                        if(position[0]==position[1]){
-                            int temp=0;
-                            temp=pairinglist[zGroup][this.findMinValuePosition(groupAssignments[position[0]])];
-                            pairinglist[zGroup][this.findMinValuePosition(groupAssignments[position[0]])]=pairinglist[zGroup][position[0]];
-                            pairinglist[zGroup][position[0]]=temp;
-                            assignments=this.getAssignmentAssociations(pairinglist, new int[competitors][competitors/groups]);
-                            for(int x=0;x<(competitors/groups);x++){
-                                System.arraycopy(assignments[pairinglist[zGroup][x]-1], 0, groupAssignments[x], 0, (competitors/groups));
-                            }
-                        }else{
-                            groupAssignments[position[0]][position[1]]=-1;
-                        }
-                    }
-                }
-                if(this.calcStandardDev(pairinglist)<bestDev){
-                    bestDev=this.calcStandardDev(pairinglist);
-                    bestPLT=pairinglist;
-
-                }
-            }
-        }
-        return bestPLT;
-    }
-    private int[] findWorstValue(int[][] groupAssignments, int neededAssigments) {
-        int[] worstValuePos=new int[2];
-        int worstValue=0;
-        for(int i=0;i<groupAssignments.length;i++){
-            for(int z=0;z<groupAssignments[0].length;z++){
-                if(groupAssignments[i][z]>=0){
-                    if(Math.abs(groupAssignments[i][z]-neededAssigments)>worstValue){
-                        worstValuePos[0]=i;
-                        worstValuePos[1]=z;
-                        worstValue=Math.abs(groupAssignments[i][z]-neededAssigments);
-                    }
-                }
-            }
-        }
-        return worstValuePos;
-    }
-
-    public int[][][] copyInto3rdDimension(int competitors, int[][] currentAssociations, int[][][] associationRow,
-            int[][] flightColumn, int zGroups,int fleet) {
-        System.arraycopy(currentAssociations[flightColumn[fleet][zGroups - 1] -1], 0, associationRow[fleet][zGroups -1], 0, competitors);
-        return associationRow;
-    }
-
-    private boolean contains(int[][] flightColumn, int comp) {
-        for (int i = 0; i < flightColumn.length; i++) {
-            for (int z = 0; z < flightColumn[0].length; z++) {
-                if (flightColumn[i][z] == comp) return true;
-            }
-        }
-        return false;
-    }
-    private int[][][] setZero(int[][][] temp){
-        for(int x=0;x<temp.length;x++){
-            for(int y=0;y<temp[0].length;y++){
-                for(int z=0;z<temp[0][0].length;z++) temp[x][y][z]=0;
-            }
-        }
-        return temp;
-    }
-
-    private int sumOf3rdDimension(int[][][] associationRow, int i, int comp) {
-        int sum = 0;
-        for (int z = 0; z < associationRow[0].length; z++) {
-            if (associationRow[i][z][comp] > -1) {
-                sum += associationRow[i][z][comp];
-            }
-        }
-        return sum;
-    }
-    private int findMinValuePosition(int[] arr){
-        int temp=Integer.MAX_VALUE;
-        int position=-1;
-        for (int z = 0; z < arr.length; z++) {
-            if (arr[z]< temp){
-                position=z ;
-                temp=arr[z];
-            }
-        }
-        return position;
-    }
-
-    private int findMaxValue(int[][][] associationRow, int i, int comp) {
-        int temp = 0;
-        for (int z = 0; z < associationRow[0].length; z++) {
-            if (associationRow[i][z][comp] > temp) temp = associationRow[i][z][comp];
-        }
-        return temp;
-    }
-
-    private int randomBW(int min,int max){
-        return min + (int) (Math.random() * ((max - min) + 1));
-    }
-
-    private int[] shuffle(int[] src) {
-        int[] result = src;
-        for(int i = 0; i<(result.length*2); i++) {
-            int o = randomBW(0, result.length-1);
-            int n = randomBW(0, randomBW(0, src.length-1));
-
-            int temp = result[o];
-            result[o] = result[n];
-            result[n] = temp;
-        }
-        return result;
-    }
-
-    private int[] getColumnIntArray(int[][] src, int row) {
-        int[] result = new int[src[0].length];
-        for (int i = 0; i < src[0].length; i++) {
-            result[i] = src[row][i];
-        }
-        return result;
-    }
-
-
-    public int[][] getAssociationsFromPairingList(int[][] pairingList, int[][] associations) {
-        for (int[] group : pairingList) {
-            for (int i = 0; i < pairingList[0].length; i++) {
-                for (int j = 0; j < pairingList[0].length; j++) {
-                    if (group[i] == group[j]) {
-                        associations[group[i] - 1][group[j] - 1] = -1;
-                    } else {
-                        associations[group[i] - 1][group[j] - 1] =
-                                associations[group[i] - 1][group[j] - 1] + 1;
-                    }
-                }
-            }
-        }
-
-        return associations;
-    }
-
-    /**
-     * @param associations: association describes a 2 dimensional array of integers, which contains the information 
-     *                      about how often the teams play against each other
-     * @return standardDev: returns how much the association values deviate from each other
-     */
-
-    protected double calcStandardDev(int[][] associations) {
-
-        double standardDev = 0;
-        
-        int k = associations[0][0],     // first value of association array
-            n = 0,                      // count of elements in association array
-            exp = 0,                    //
-            exp2 = 0;                   //
-
-        for (int i = 0; i < associations.length; i++) {
-            for (int j = 0; j < associations[0].length; j++) {
-                if (associations[i][j] < 0) {
-                    continue;
-                }
-
-                n += 1;
-                exp += associations[i][j] - k;
-                exp2 += Math.pow(associations[i][j] - k, 2);
-            }
-        }
-
-        // expression in Math.sqrt() is equal to variance / n
-        standardDev = Math.sqrt((exp2 - (Math.pow(exp, 2)) / n) / n);
-        
-        return standardDev;
-    }
-    
-    private double getMaxValueOfArray(int[] arr) {
-        double maxValue = 0;
-
-        for (int val: arr) {
-            if (val > maxValue) {
-                maxValue = val;
-            }
-        }
-
-        return maxValue;
-    }
-
-    private double getMaxValueOfArray(int[][] arr) {
-        double maxValue = 0;
-
-        for (int[] val: arr) {
-            if (this.getMaxValueOfArray(val) > maxValue) {
-                maxValue = this.getMaxValueOfArray(val);
-            }
-        }
-
-        return maxValue;
-    }
-}
-
-