nathanwoodburn/comp1110-ass2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

state: cleaned & optimized linking

Browse Source
This commit is contained in:
Nathan Woodburn 2023-05-06 18:53:42 +10:00
parent bdaaf35a88
commit 506c2bb395
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/comp1110/ass2/State.java
View File

@ -561,56 +561,48 @@ public class State {
*/ */
public int scoreLinks(int playerID) { public int scoreLinks(int playerID) {
int numOfIslands = 0; Coord[] playerCoords = players[playerID].getPieces();
Coord[] playerCoords = players[playerID].getPieces(); // playerCoords
Set<Coord> playerCoordsSet = new HashSet<>(Arrays.asList(playerCoords)); Set<Coord> playerCoordsSet = new HashSet<>(Arrays.asList(playerCoords));
Set<Coord> playerLongestLink = findLongestLink(playerCoordsSet, islands); int maxScore = findLongestLinkScore(playerCoordsSet, islands);
outerLoop: return maxScore;
for(Island island : islands) {
for ( Coord playerCoord : playerLongestLink ) {
if (island.containsCoord(playerCoord)) {
numOfIslands++;
continue outerLoop;
}
}
} }
return numOfIslands * 5; public static int findLongestLinkScore ( Set<Coord> allCoords, Island[] islands) {
}
public static Set<Coord> findLongestLink ( Set<Coord> allCoords, Island[] islands) {
Set<Coord> longest = new HashSet<>(); Set<Coord> longest = new HashSet<>();
Set<Coord> current = new HashSet<>(); Set<Coord> current = new HashSet<>();
Coord now; Coord now;
int max = scoreForLink(longest,islands);
for(Island islandIter : islands) { for(Island islandIter : islands) {
for ( Coord coords : allCoords) { for ( Coord coords : allCoords) {
if(islandIter.containsCoord(coords)) { if(islandIter.containsCoord(coords)) {
now = coords; now = coords;
current.add(coords); current.add(coords);
recurssionLink(allCoords, current, longest, now); recursionLink(allCoords, current, longest, now);
// if the score is bigger, update the Set // if the score is bigger, update the Set
if(scoreForLink(current, islands) > scoreForLink(longest,islands)) { if(scoreForLink(current, islands) > max) {
longest.clear(); longest.clear();
longest.addAll(current); longest.addAll(current);
max = scoreForLink(longest, islands);
} }
current = new HashSet<>(); current = new HashSet<>();
} }
} }
} }
return longest; return max;
} }
public static void recurssionLink (Set<Coord> allCoords, Set<Coord> current, Set<Coord> longest, Coord now) { public static void recursionLink(Set<Coord> allCoords, Set<Coord> current, Set<Coord> longest, Coord now) {
current.add(now); current.add(now);
for(Coord c : allCoords) { for(Coord c : allCoords) {
if( (now.isAdjacent(c) || now.isAdjacentDiagonal(c)) && !current.contains(c) ) { if( now.isAdjacentDiagonal(c) && !current.contains(c) ) {
recurssionLink(allCoords, current, longest, c); recursionLink(allCoords, current, longest, c);
} }
} }
} }