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

Merge branch 'bugfix/sonneborn-fix' into develop

Browse Source
This commit is contained in:
Jeroen De Meerleer 2019-12-22 17:58:45 +01:00
commit 1a7f3eae26
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
2 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Player.php
View File

@ -211,28 +211,49 @@ class Player
} }
/** /**
* Returns the points of the player. * Returns the points of the player after round $round
* *
* 1 Point is awarded for winning * 1 Point is awarded for winning
* 0.5 points are awarded for draw * 0.5 points are awarded for draw
* 0 points are awarded for loss
* *
* @param int $round
* @return float * @return float
*/ */
public function calculatePoints(): float public function calculatePoints(int $round = -1): float
{ {
$points = 0; $points = 0;
foreach ($this->Pairings as $pairing) { foreach ($this->Pairings as $key=>$pairing) {
if($key < $round || $round == -1) {
if (array_search($pairing->Result, Constants::Won) !== false) { if (array_search($pairing->Result, Constants::Won) !== false) {
$points = $points + 1; $points = $points + 1;
} elseif (array_search($pairing->Result, Constants::Draw) !== false) { } elseif (array_search($pairing->Result, Constants::Draw) !== false) {
$points = $points + 0.5; $points = $points + 0.5;
} }
} }
}
return $points; return $points;
} }
/** /**
* Returns the points of the player that should be used for buchholz. * Returns the points of a virtual player as described in the Fide Handbook C.02 chapter 13.15.2.
*
* 1 Point is awarded for winning
* 0.5 points are awarded for draw
* Unplayed results are conside
*
* @return float
*/
public function calculatePointsForVirtualPlayer(int $byeround): float
{
$points = $this->calculatePoints($byeround);
foreach (array_slice($this->Pairings, $byeround +1) as $key=>$pairing) {
$points += 0.5;
}
return $points;
}
/**
* Returns the points of the player that should be used for tiebreaking systems.
* *
* 1 Point is awarded for winning * 1 Point is awarded for winning
* 0.5 points are awarded for draw * 0.5 points are awarded for draw
@ -240,7 +261,7 @@ class Player
* *
* @return float * @return float
*/ */
private function pointsForBuchholz(): float public function calculatePointsForTiebreaks(): float
{ {
$points = 0; $points = 0;
foreach ($this->Pairings as $pairing) { foreach ($this->Pairings as $pairing) {
@ -313,8 +334,6 @@ class Player
return $this->playedGames(); return $this->playedGames();
} elseif ($key == 'NoOfWins') { } elseif ($key == 'NoOfWins') {
return $this->noOfWins(); return $this->noOfWins();
} elseif ($key == 'PointsForBuchholz') {
return $this->pointsForBuchholz();
} elseif (isset($this->BinaryData[$key])) { } elseif (isset($this->BinaryData[$key])) {
return $this->BinaryData[$key]; return $this->BinaryData[$key];
} }

15
src/Tournament.php
View File

@ -813,14 +813,12 @@ class Tournament
$intpairings = []; $intpairings = [];
$curpoints = 0; $curpoints = 0;
$curround = 1; $curround = 1;
foreach ($intpairingsWithBye as $pairing) { foreach ($intpairingsWithBye as $key=>$pairing) {
$roundstoplay = (count($intpairingsWithBye)) - $curround; $roundstoplay = (count($intpairingsWithBye)) - $curround;
if (is_null($pairing->Opponent)) { if (is_null($pairing->Opponent)) {
$forfait = explode(' ', $pairing->Result)[0]+0; $intpairings[] = $player->calculatePointsForVirtualPlayer($key);
$notaplayer = $curpoints + (1 - $forfait) + 0.5 * $roundstoplay;
$intpairings[] = $notaplayer;
} else { } else {
$intpairings[] = $pairing->Opponent->PointsForBuchholz; $intpairings[] = $pairing->Opponent->calculatePointsForTiebreaks();
if (array_search($pairing->Result, Constants::Won) !== false) { if (array_search($pairing->Result, Constants::Won) !== false) {
$curpoints += 1; $curpoints += 1;
} elseif (array_search($pairing->Result, Constants::Draw) !== false) { } elseif (array_search($pairing->Result, Constants::Draw) !== false) {
@ -856,11 +854,14 @@ class Tournament
foreach ($player->Pairings as $key => $pairing) { foreach ($player->Pairings as $key => $pairing) {
if ($pairing->Opponent) { if ($pairing->Opponent) {
if (array_search($pairing->Result, Constants::Won) !== false) { if (array_search($pairing->Result, Constants::Won) !== false) {
$tiebreak += $pairing->Opponent->calculatePoints(); $tiebreak += $pairing->Opponent->calculatePointsForTiebreaks();
} elseif (array_search($pairing->Result, Constants::Draw) !== false) { } elseif (array_search($pairing->Result, Constants::Draw) !== false) {
$tiebreak += $pairing->Opponent->calculatePoints() / 2; $tiebreak += $pairing->Opponent->calculatePointsForTiebreaks() / 2;
} }
} }
if (array_search($pairing->Result, Constants::NotPlayed) !== false) {
$tiebreak += $player->calculatePointsForVirtualPlayer($key);
}
} }
return $tiebreak; return $tiebreak;
} }