Skip to content

Commit

Permalink
Fix tests and more cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
@asvitkine
asvitkine committed Aug 27, 2023
1 parent b0c1c0c commit 538349d
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 44 deletions.
27 changes: 14 additions & 13 deletions game-app/game-core/src/main/java/games/strategy/triplea/attachments/CanalAttachment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import games.strategy.triplea.delegate.Matches;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.triplea.java.collections.CollectionUtils;
Expand Down Expand Up @@ -44,13 +45,7 @@ public static boolean isCanalOnRoute(final String canalName, final Route route)
}
boolean previousTerritoryHasCanal = false;
for (final Territory t : route) {
boolean currentTerritoryHasCanal = false;
for (final CanalAttachment canalAttachment : get(t)) {
if (canalAttachment.getCanalName().equals(canalName)) {
currentTerritoryHasCanal = true;
break;
}
}
boolean currentTerritoryHasCanal = !getByCanalName(t, canalName).isEmpty();
if (previousTerritoryHasCanal && currentTerritoryHasCanal) {
return true;
}
Expand All @@ -59,10 +54,19 @@ public static boolean isCanalOnRoute(final String canalName, final Route route)
return false;
}

public static Set<CanalAttachment> get(final Territory t) {
public static Set<CanalAttachment> get(final Territory t, final Route onRoute) {
return get(t, attachment -> isCanalOnRoute(attachment.getCanalName(), onRoute));
}

public static Set<CanalAttachment> getByCanalName(final Territory t, final String canalName) {
return get(t, canalAttachment -> canalAttachment.getCanalName().equals(canalName));
}

private static Set<CanalAttachment> get(final Territory t, Predicate<CanalAttachment> cond) {
return t.getAttachments().values().stream()
.filter(attachment -> attachment.getName().startsWith(Constants.CANAL_ATTACHMENT_PREFIX))
.map(CanalAttachment.class::cast)
.filter(cond)
.collect(Collectors.toSet());
}

Expand Down Expand Up @@ -162,11 +166,8 @@ public void validate(final GameState data) throws GameParseException {
}
final Set<Territory> territories = new HashSet<>();
for (final Territory t : data.getMap()) {
final Set<CanalAttachment> canalAttachments = get(t);
for (final CanalAttachment canalAttachment : canalAttachments) {
if (canalAttachment.getCanalName().equals(canalName)) {
territories.add(t);
}
if (!getByCanalName(t, canalName).isEmpty()) {
territories.add(t);
}
}
if (territories.size() != 2) {
Expand Down
62 changes: 31 additions & 31 deletions ...ame-core/src/main/java/games/strategy/triplea/delegate/move/validation/MoveValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,9 @@ private MoveValidationResult validateFirst(
.negate());
if (matches.isEmpty() || !matches.stream().allMatch(Matches.unitIsOwnedBy(player))) {
result.setError(
"Player, "
+ player.getName()
+ ", is not owner of all the units: "
+ MyFormatter.unitsToTextNoOwner(units));
String.format(
"Player, %s, is not owner of all the units: %s",
player.getName(), MyFormatter.unitsToTextNoOwner(units)));
return result;
}
}
Expand All @@ -216,9 +215,8 @@ private MoveValidationResult validateFirst(
final Collection<Territory> landOnRoute = route.getMatches(Matches.territoryIsLand());
if (!landOnRoute.isEmpty()) {
// TODO: if this ever changes, we need to also update getBestRoute(), because getBestRoute is
// also checking to
// make sure we avoid land territories owned by nations with these 2 relationship type
// attachment options
// also checking to make sure we avoid land territories owned by nations with these 2
// relationship type attachment options
for (final Territory t : landOnRoute) {
if (units.stream().anyMatch(Matches.unitIsLand())
&& !data.getRelationshipTracker().canMoveLandUnitsOverOwnedLand(player, t.getOwner())) {
Expand Down Expand Up @@ -300,36 +298,41 @@ String validateCanal(
@Nullable final Collection<Unit> units,
final Map<Unit, Collection<Unit>> airTransportDependents,
final GamePlayer player) {
List<CanalAttachment> canals =
route.getAllTerritories().stream()
.map(t -> CanalAttachment.get(t))
.flatMap(Collection::stream)
// Only check canals that are on the route
.filter(c -> CanalAttachment.isCanalOnRoute(c.getCanalName(), route))
.collect(Collectors.toList());
if (canals.isEmpty()) {
Map<Territory, Collection<CanalAttachment>> territoryCanals = new HashMap<>();
int numCanals = 0;
for (Territory t : route.getAllTerritories()) {
// Only check canals that are on the route
var canals = CanalAttachment.get(t, route);
territoryCanals.put(t, canals);
numCanals += canals.size();
}
if (numCanals == 0) {
return null;
}
final boolean mustControlAllCanals =
Properties.getControlAllCanalsBetweenTerritoriesToPass(data.getProperties());

// Check each unit 1 by 1 to see if they can move through necessary canals on route
String result = null;
final Set<Unit> unitsThatFailCanal = new HashSet<>();
final Set<Unit> setWithNull = new HashSet<>();
setWithNull.add(null);
final Collection<Unit> unitsWithoutDependents =
(units == null)
? Set.of((Unit) null)
: findNonDependentUnits(units, route, airTransportDependents);
(units == null) ? setWithNull : findNonDependentUnits(units, route, airTransportDependents);
for (final Unit unit : unitsWithoutDependents) {
for (CanalAttachment canalAttachment : canals) {
Optional<String> failureMessage = canPassThroughCanal(canalAttachment, unit, player);
final boolean canPass = failureMessage.isEmpty();
if (mustControlAllCanals != canPass) {
// If need to control any canal and can pass OR need to control all and can't pass.
if (!canPass) {
result = failureMessage.get();
unitsThatFailCanal.add(unit);
for (final Territory t : route.getAllTerritories()) {
Optional<String> failureMessage = Optional.empty();
for (CanalAttachment canalAttachment : territoryCanals.get(t)) {
failureMessage = canPassThroughCanal(canalAttachment, unit, player);
final boolean canPass = failureMessage.isEmpty();
if (mustControlAllCanals != canPass) {
// If need to control any canal and can pass OR need to control all and can't pass.
break;
}
break;
}
if (failureMessage.isPresent()) {
result = failureMessage.get();
unitsThatFailCanal.add(unit);
}
}
}
Expand Down Expand Up @@ -369,10 +372,7 @@ public boolean canAnyUnitsPassCanal(
final GamePlayer player) {
boolean canPass = true;
final Route route = new Route(start, end);
for (final CanalAttachment canalAttachment : CanalAttachment.get(start)) {
if (!CanalAttachment.isCanalOnRoute(canalAttachment.getCanalName(), route)) {
continue; // Only check canals that are on the route
}
for (final CanalAttachment canalAttachment : CanalAttachment.get(start, route)) {
final Collection<Unit> unitsWithoutDependents = findNonDependentUnits(units, route, Map.of());
canPass = canAnyPassThroughCanal(canalAttachment, unitsWithoutDependents, player).isEmpty();
final boolean mustControlAllCanals =
Expand Down

0 comments on commit 538349d

Please sign in to comment.