Skip to content

DNF gives 0 points instead of position points #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KujawskiSzymon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

DNF gives 0 points instead of position points #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 36 additions & 20 deletions server/src/main/java/gp/Season.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@ public class Season implements Comparable<Season>, TrackSelector {
this.name = name;
}

class PositionData {
int position;
boolean dnf;

PositionData(int position, boolean dnf) {
this.position = position;
this.dnf = dnf;
}
}

private int getPoints(int position) {
return position > pointDistribution.length ? 0 : pointDistribution[position - 1];
}
Expand Down Expand Up @@ -218,20 +228,21 @@ public int getIconHeight() {
}
}

private int compare(UUID id1, UUID id2, Map<UUID, List<Integer>> positions) {
final int total1 = positions.get(id1).stream().mapToInt(this::getPoints).sum();
final int total2 = positions.get(id2).stream().mapToInt(this::getPoints).sum();
if (total1 == total2) {
for (int i = 0; i < pointDistribution.length; ++i) {
final int relevantPos = i;
final long posCount1 = positions.get(id1).stream().filter(pos -> pos == relevantPos).count();
final long posCount2 = positions.get(id2).stream().filter(pos -> pos == relevantPos).count();
if (posCount1 != posCount2) {
return (int) (posCount2 - posCount1);
}
}
}
return total2 - total1;
private int compare(UUID id1, UUID id2, Map<UUID, List<PositionData>> positions) {
List<PositionData> pos1 = positions.get(id1);
List<PositionData> pos2 = positions.get(id2);

// Handle cases where one or both players have no positions
if (pos1 == null && pos2 == null) return 0;
if (pos1 == null) return 1;
if (pos2 == null) return -1;

// Calculate total points for each player
int totalPoints1 = pos1.stream().mapToInt(pd -> pd.dnf ? 0 : getPoints(pd.position)).sum();
int totalPoints2 = pos2.stream().mapToInt(pd -> pd.dnf ? 0 : getPoints(pd.position)).sum();

// Compare total points
return Integer.compare(totalPoints2, totalPoints1); // Descending order
}

private JPanel createStandingsPanel() {
Expand All @@ -252,16 +263,20 @@ private JPanel createStandingsPanel() {
c3.gridy = 0;
c3.weightx = 0.55;
panel.setBorder(new EmptyBorder(20, 20, 20, 20));
final Map<UUID, List<Integer>> positions = new HashMap<>();
final Map<UUID, List<PositionData>> positions = new HashMap<>();
for (FinalStandings result : results) {
for (PlayerStats stats :result.getStats()) {
positions.computeIfAbsent(stats.id, id -> new ArrayList<>()).add(stats.position);
for (PlayerStats stats : result.getStats()) {
boolean dnf = stats.hitpoints < 1; // Check if the player did not finish
positions.computeIfAbsent(stats.id, id -> new ArrayList<>()).add(new PositionData(stats.position, dnf));
}
}

if (results.isEmpty()) {
sortedParticipants = new ArrayList<>(participants);
} else {
sortedParticipants = participants.stream().sorted((p1, p2) -> compare(p1.getId(), p2.getId(), positions)).collect(Collectors.toList());
sortedParticipants = participants.stream()
.sorted((p1, p2) -> compare(p1.getId(), p2.getId(), positions))
.collect(Collectors.toList());
}
// Header
panel.add(new JLabel(), c1);
Expand Down Expand Up @@ -348,7 +363,7 @@ public void mouseExited(MouseEvent e) {
final JLabel pos = new JLabel((rank + 1) + ".");
final JLabel label = new JLabel(player.getName());
final JPanel ptsTable = new JPanel(new GridLayout(0, tracksAndLaps.size() + 1));
final int total = results.isEmpty() ? 0 : positions.get(player.getId()).stream().mapToInt(this::getPoints).sum();
final int total = results.isEmpty() ? 0 : positions.get(player.getId()).stream().mapToInt(pd -> pd.dnf ? 0 : getPoints(pd.position)).sum();
final JLabel pts = new JLabel(Integer.toString(total));
pos.setFont(new Font("Arial", Font.BOLD, 20));
label.setFont(new Font("Arial", Font.BOLD, 20));
Expand All @@ -369,7 +384,8 @@ public void mouseExited(MouseEvent e) {
for (int i = 0; i < tracksAndLaps.size(); ++i) {
final JLabel ptsLabel;
if (results.size() > i) {
ptsLabel = new JLabel(Integer.toString(getPoints(positions.get(player.getId()).get(i))));
PositionData pd = positions.get(player.getId()).get(i);
ptsLabel = new JLabel(Integer.toString(pd.dnf ? 0 : getPoints(pd.position)));
} else {
ptsLabel = new JLabel("-");
}
Expand Down