JeroenED/libpairtwo
1
0
Fork 0
mirror of https://github.com/JeroenED/libpairtwo.git synced 2024-11-24 23:37:41 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/Performance' into develop

Browse Source
This commit is contained in:
Jeroen De Meerleer 2019-06-01 13:39:02 +02:00
commit 5d4f4791cf
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Player.php
View File

@ -131,24 +131,24 @@ class Player extends PlayerModel
/**
* @return int
*/
public function getPerformance(string $type) : int
public function getPerformance(string $type, int $unratedElo) : float
{
$total = 0;
$opponents = 0;
foreach ($this->getPairings() as $pairing) {
if (array_search($pairing->getResult(), Constants::Notplayed)) {
if (array_search($pairing->getResult(), Constants::NotPlayed) === false) {
$opponentElo = $pairing->getOpponent()->getElo($type);
$opponentElo = $opponentElo != 0 ? $opponentElo : $this->getUnratedElo();
if (array_search(self::Won, $pairing->getResult())) {
$opponentElo = $opponentElo != 0 ? $opponentElo : $unratedElo;
if (array_search($pairing->getResult(), Constants::Won) !== false) {
$total += $opponentElo + 400;
} elseif (array_search(self::Lost, $pairing->getResult())) {
} elseif (array_search($pairing->getResult(), Constants::Lost) !== false) {
$total += $opponentElo - 400;
} elseif (array_search(self::Draw, $pairing->getResult())) {
} elseif (array_search($pairing->getResult(), Constants::Draw) !== false) {
$total += $opponentElo;
}
$opponents++;
}
return round($total / $opponents);
}
return round($total / $opponents);
}
}

2
src/Readers/Pairtwo6.php
View File

@ -79,7 +79,7 @@ class Pairtwo6 extends Pairtwo6Model implements ReaderInterface
$this->setTournament(new Tournament());
$this->getTournament()->setPriorityElo('Nation');
$this->getTournament()->setPriorityId('Nation');
$this->getTournament()->setPriorityId('Nation');
// UserCountry
$length = 4;
$this->setBinaryData("UserCountry", $this->readData('Int', substr($swscontents, $offset, $length)));

9
src/Tiebreaks.php
View File

@ -157,7 +157,7 @@ abstract class Tiebreaks extends Tournament
$allratings = [];
foreach ($pairings as $pairing) {
if (array_search($pairing->getResult(), Constants::NotPlayed) === false) {
$toadd = $pairing->getOpponent()->getPerformance($type);
$toadd = $pairing->getOpponent()->getPerformance($type, $this->getNonRatedElo());
if ($toadd != 0) {
$allratings[] = $toadd;
}
@ -215,9 +215,10 @@ abstract class Tiebreaks extends Tournament
array_slice($intpairings, 0 - $cuthighest);
foreach ($intpairings as $intkey => $intpairing) {
if(!is_null($intpairing->getOpponent())){
$tiebreak += $intpairing->getOpponent()->getPoints();
}}
if (!is_null($intpairing->getOpponent())) {
$tiebreak += $intpairing->getOpponent()->getPoints();
}
}
return $tiebreak;
}

2
src/Tournament.php
View File

@ -321,7 +321,7 @@ class Tournament extends Tiebreaks
return $this->calculateAveragePerformance($player, $this->getPriorityElo());
break;
case Tiebreak::Performance:
return $player->getPerformance($this->getPriorityElo());
return $player->getPerformance($this->getPriorityElo(), $this->getNonRatedElo());
break;
default:
return null;