Skip to content
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

Jump to bottom

#2092 Fix skill tester rating predictions #2098

Merged
merged 3 commits into from
Jul 2, 2024
Merged

#2092 Fix skill tester rating predictions #2098

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fb9c43
#2092 Fix skill tester rating predictions
wsbrenk Jun 30, 2024
18ea19d
#2092 typo
wsbrenk Jul 1, 2024
39a7f9b
Merge branch 'refs/heads/release/8' into #2092
wsbrenk Jul 2, 2024
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
154 changes: 87 additions & 67 deletions src/main/java/module/playerOverview/SpielerTrainingsSimulatorPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ final class SpielerTrainingsSimulatorPanel extends ImagePanel
private final JLabel m_jlLoyalty = new JLabel();
private final JLabel m_jlHomeGrown = new JLabel();
private Player m_clPlayer;
private final Player tempPlayer = new Player();
private Player tempPlayer;

//~ Constructors -------------------------------------------------------------------------------

Expand All @@ -169,15 +169,20 @@ final class SpielerTrainingsSimulatorPanel extends ImagePanel

//~ Methods ------------------------------------------------------------------------------------
public void setSpieler(Player player) {

m_clPlayer = player;

if (player != null) {
setLabels();
// Setting the combo box values should not change the tempPlayer settings
setCBs();
// Initialize temp player with combo box values
initTempPlayer();
setLabels();

//Remove for Temp player
m_jbRemoveTempSpieler.setEnabled(player.getPlayerId() < 0);
} else {
tempPlayer = null;
resetLabels();
resetCBs();
m_jbRemoveTempSpieler.setEnabled(false);
Expand All @@ -187,30 +192,51 @@ public void setSpieler(Player player) {
repaint();
}

/**
* Initialize temporal player instance with combo box selections
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

“temporal” : temporary?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

* A new tempPlayer is required since rating prediction calculation caches players prediction values
*/
private void initTempPlayer() {
this.tempPlayer = new Player();
tempPlayer.setForm(((CBItem) m_jcbForm.getSelectedItem()).getId());
tempPlayer.setExperience(((CBItem) m_jcbErfahrung.getSelectedItem()).getId());
tempPlayer.setStamina(((CBItem) m_jcbKondition.getSelectedItem()).getId());
tempPlayer.setDefendingSkill(((CBItem) m_jcbVerteidigung.getSelectedItem()).getId());
tempPlayer.setSpecialty(((CBItem) m_jcbSpeciality.getSelectedItem()).getId());
tempPlayer.setScoringSkill(((CBItem) m_jcbTorschuss.getSelectedItem()).getId());
tempPlayer.setGoalkeeperSkill(((CBItem) m_jcbTorwart.getSelectedItem()).getId());
tempPlayer.setWingerSkill(((CBItem) m_jcbFluegel.getSelectedItem()).getId());
tempPlayer.setPassingSkill(((CBItem) m_jcbPasspiel.getSelectedItem()).getId());
tempPlayer.setSetPiecesSkill(((CBItem) m_jcbStandard.getSelectedItem()).getId());
tempPlayer.setPlaymakingSkill(((CBItem) m_jcbSpielaufbau.getSelectedItem()).getId());
tempPlayer.setLoyalty(((CBItem) m_jcbLoyalty.getSelectedItem()).getId());
tempPlayer.setHomeGrown(m_jchHomegrown.isSelected());
}

public void actionPerformed(ActionEvent e) {
if (e.getSource().equals(m_jbAddTempSpieler)) {
final Player tempPlayer = new Player();
tempPlayer.setHrfDate();
tempPlayer.setNationalityId(HOVerwaltung.instance().getModel().getBasics().getLand());
tempPlayer.setPlayerId(module.transfer.scout.TransferEingabePanel
var player = new Player();
player.setHrfDate();
player.setNationalityId(HOVerwaltung.instance().getModel().getBasics().getLand());
player.setPlayerId(module.transfer.scout.TransferEingabePanel
.getNextTempSpielerID());
tempPlayer.setLastName("Temp " + Math.abs(1000 + tempPlayer.getPlayerId()));
tempPlayer.setAge(getAge());
tempPlayer.setAgeDays(getAgeDays());
tempPlayer.setExperience(((CBItem) m_jcbErfahrung.getSelectedItem()).getId());
tempPlayer.setForm(((CBItem) m_jcbForm.getSelectedItem()).getId());
tempPlayer.setStamina(((CBItem) m_jcbKondition.getSelectedItem()).getId());
tempPlayer.setDefendingSkill(((CBItem) m_jcbVerteidigung.getSelectedItem()).getId());
tempPlayer.setSpecialty(((CBItem) m_jcbSpeciality.getSelectedItem()).getId());
tempPlayer.setScoringSkill(((CBItem) m_jcbTorschuss.getSelectedItem()).getId());
tempPlayer.setGoalkeeperSkill(((CBItem) m_jcbTorwart.getSelectedItem()).getId());
tempPlayer.setWingerSkill(((CBItem) m_jcbFluegel.getSelectedItem()).getId());
tempPlayer.setPassingSkill(((CBItem) m_jcbPasspiel.getSelectedItem()).getId());
tempPlayer.setSetPiecesSkill(((CBItem) m_jcbStandard.getSelectedItem()).getId());
tempPlayer.setPlaymakingSkill(((CBItem) m_jcbSpielaufbau.getSelectedItem()).getId());
tempPlayer.setLoyalty(((CBItem) m_jcbLoyalty.getSelectedItem()).getId());
tempPlayer.setHomeGrown(m_jchHomegrown.isSelected());
HOVerwaltung.instance().getModel().addPlayer(tempPlayer);
player.setLastName("Temp " + Math.abs(1000 + player.getPlayerId()));
player.setAge(getAge());
player.setAgeDays(getAgeDays());
player.setExperience(((CBItem) m_jcbErfahrung.getSelectedItem()).getId());
player.setForm(((CBItem) m_jcbForm.getSelectedItem()).getId());
player.setStamina(((CBItem) m_jcbKondition.getSelectedItem()).getId());
player.setDefendingSkill(((CBItem) m_jcbVerteidigung.getSelectedItem()).getId());
player.setSpecialty(((CBItem) m_jcbSpeciality.getSelectedItem()).getId());
player.setScoringSkill(((CBItem) m_jcbTorschuss.getSelectedItem()).getId());
player.setGoalkeeperSkill(((CBItem) m_jcbTorwart.getSelectedItem()).getId());
player.setWingerSkill(((CBItem) m_jcbFluegel.getSelectedItem()).getId());
player.setPassingSkill(((CBItem) m_jcbPasspiel.getSelectedItem()).getId());
player.setSetPiecesSkill(((CBItem) m_jcbStandard.getSelectedItem()).getId());
player.setPlaymakingSkill(((CBItem) m_jcbSpielaufbau.getSelectedItem()).getId());
player.setLoyalty(((CBItem) m_jcbLoyalty.getSelectedItem()).getId());
player.setHomeGrown(m_jchHomegrown.isSelected());
HOVerwaltung.instance().getModel().addPlayer(player);
RefreshManager.instance().doReInit();
HOMainFrame.instance().showTab(IModule.PLAYEROVERVIEW);
} else if (e.getSource().equals(m_jbRemoveTempSpieler)) {
Expand All @@ -223,6 +249,11 @@ public void actionPerformed(ActionEvent e) {
public void itemStateChanged(ItemEvent itemEvent) {
if ((itemEvent.getStateChange() == ItemEvent.SELECTED) || (itemEvent.getSource() == m_jchHomegrown)) {
if (m_clPlayer != null) {
// During initial combo box settings the tempPlayer is null and the tempPlayer initialization is called after setCBs
if ( tempPlayer != null ) {
// User interactions will create new temp player instances, to invalidate prediction cache entries
initTempPlayer();
}
setLabels();
} else {
resetLabels();
Expand Down Expand Up @@ -284,54 +315,43 @@ private void setCBs() {
}

private void setLabels() {
tempPlayer.setForm(((CBItem) m_jcbForm.getSelectedItem()).getId());
tempPlayer.setExperience(((CBItem) m_jcbErfahrung.getSelectedItem()).getId());
tempPlayer.setStamina(((CBItem) m_jcbKondition.getSelectedItem()).getId());
tempPlayer.setDefendingSkill(((CBItem) m_jcbVerteidigung.getSelectedItem()).getId());
tempPlayer.setSpecialty(((CBItem) m_jcbSpeciality.getSelectedItem()).getId());
tempPlayer.setScoringSkill(((CBItem) m_jcbTorschuss.getSelectedItem()).getId());
tempPlayer.setGoalkeeperSkill(((CBItem) m_jcbTorwart.getSelectedItem()).getId());
tempPlayer.setWingerSkill(((CBItem) m_jcbFluegel.getSelectedItem()).getId());
tempPlayer.setPassingSkill(((CBItem) m_jcbPasspiel.getSelectedItem()).getId());
tempPlayer.setSetPiecesSkill(((CBItem) m_jcbStandard.getSelectedItem()).getId());
tempPlayer.setPlaymakingSkill(((CBItem) m_jcbSpielaufbau.getSelectedItem()).getId());
tempPlayer.setLoyalty(((CBItem) m_jcbLoyalty.getSelectedItem()).getId());
tempPlayer.setHomeGrown(m_jchHomegrown.isSelected());

m_jlForm.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getForm() - m_clPlayer.getForm(), true));
m_jlKondition.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getStamina() - m_clPlayer.getStamina(), true));
m_jlErfahrung.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getExperience() - m_clPlayer.getExperience(), true));
m_jlSpielaufbau.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getPlaymakingSkill() - m_clPlayer.getPlaymakingSkill(), true));
m_jlFluegel.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getWingerSkill() - m_clPlayer.getWingerSkill(), true));
m_jlTorschuss.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getScoringSkill() - m_clPlayer.getScoringSkill(), true));
m_jlTorwart.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getGoalkeeperSkill() - m_clPlayer.getGoalkeeperSkill(), true));
m_jlPasspiel.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getPassingSkill() - m_clPlayer.getPassingSkill(), true));
m_jlVerteidigung.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getDefendingSkill() - m_clPlayer.getDefendingSkill(), true));
m_jlStandard.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getSetPiecesSkill() - m_clPlayer.getSetPiecesSkill(), true));
m_jlLoyalty.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getLoyalty() - m_clPlayer.getLoyalty(), true));
int hg = 0;
if (m_clPlayer.isHomeGrown() != tempPlayer.isHomeGrown()) {
if (m_clPlayer.isHomeGrown())
hg = -1;
else
hg = 1;
}
m_jlHomeGrown.setIcon(ImageUtilities.getImageIcon4Change(hg, true));
if ( tempPlayer != null ) { // do no temp player settings during combo boxes initializations
m_jlForm.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getForm() - m_clPlayer.getForm(), true));
m_jlKondition.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getStamina() - m_clPlayer.getStamina(), true));
m_jlErfahrung.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getExperience() - m_clPlayer.getExperience(), true));
m_jlSpielaufbau.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getPlaymakingSkill() - m_clPlayer.getPlaymakingSkill(), true));
m_jlFluegel.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getWingerSkill() - m_clPlayer.getWingerSkill(), true));
m_jlTorschuss.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getScoringSkill() - m_clPlayer.getScoringSkill(), true));
m_jlTorwart.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getGoalkeeperSkill() - m_clPlayer.getGoalkeeperSkill(), true));
m_jlPasspiel.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getPassingSkill() - m_clPlayer.getPassingSkill(), true));
m_jlVerteidigung.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getDefendingSkill() - m_clPlayer.getDefendingSkill(), true));
m_jlStandard.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getSetPiecesSkill() - m_clPlayer.getSetPiecesSkill(), true));
m_jlLoyalty.setIcon(ImageUtilities.getImageIcon4Change(tempPlayer.getLoyalty() - m_clPlayer.getLoyalty(), true));
int hg = 0;
if (m_clPlayer.isHomeGrown() != tempPlayer.isHomeGrown()) {
if (m_clPlayer.isHomeGrown())
hg = -1;
else
hg = 1;
}
m_jlHomeGrown.setIcon(ImageUtilities.getImageIcon4Change(hg, true));

var r = tempPlayer.getIdealPositionRating();
var idealPosition = tempPlayer.getIdealPosition();
m_jpBestPos.setText(MatchRoleID.getNameForPosition(idealPosition)
+ " (" + Helper.getNumberFormat(false, core.model.UserParameter.instance().nbDecimals)
.format(r) + ")");
var r = tempPlayer.getIdealPositionRating();
var idealPosition = tempPlayer.getIdealPosition();
m_jpBestPos.setText(MatchRoleID.getNameForPosition(idealPosition)
+ " (" + Helper.getNumberFormat(false, core.model.UserParameter.instance().nbDecimals)
.format(r) + ")");

for (int i = 0; i < playerPositionValues.length; i++) {
showWithCompare(playerPositionValues[i], playerPosition[i]);
}
for (int i = 0; i < playerPositionValues.length; i++) {
showWithCompare(playerPositionValues[i], playerPosition[i]);
}

tempPlayer.setAge(getAge());
tempPlayer.setAgeDays(getAgeDays());
tempPlayer.setLeadership(m_clPlayer.getLeadership());
tempPlayer.setSpecialty(m_clPlayer.getSpecialty());
tempPlayer.setAge(getAge());
tempPlayer.setAgeDays(getAgeDays());
tempPlayer.setLeadership(m_clPlayer.getLeadership());
tempPlayer.setSpecialty(m_clPlayer.getSpecialty());
}
}

private void showWithCompare(DoubleLabelEntries labelEntry, byte playerPosition) {
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/release_notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* Fix error on player details display after initial download (#2044)
* Update missing world details in database (#2063)
* Reduce space between team summary labels (#2069)
* Fix skill tester rating prediction (#2092)

### Series
* Initialize series table if no matches are played yet (#1455)
Expand Down