From ad1f64914acc8049eb0feb9c475bc381d5b85f95 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Sat, 26 Oct 2019 23:20:56 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=D0=90=D0=BC=D0=B5=D1=80=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B8=D0=BA=D0=BE=D0=B3=D0=B4=D0=B0=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no such thing as american scoring. The only american thing in tournament chess is the american pairing system wihich uses some variables to calculate your opponent. One of these was called americanpoints in the original sources of pairtwo. This one was unfortunatly mistaken to really contain an american scoring --- src/Enums/Tiebreak.php | 1 - src/Readers/Pairtwo6.php | 3 +-- src/Readers/Swar4.php | 2 -- src/Tournament.php | 16 ---------------- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/Enums/Tiebreak.php b/src/Enums/Tiebreak.php index 7f44284..3f9745b 100644 --- a/src/Enums/Tiebreak.php +++ b/src/Enums/Tiebreak.php @@ -29,7 +29,6 @@ class Tiebreak extends Enum const None = ""; const Keizer = "Keizer"; const Points = "Points"; - const American = "American"; const Buchholz = "Buchholz"; const BuchholzMed = "Buchholz Median"; const BuchholzCut = "Buchholz Cut"; diff --git a/src/Readers/Pairtwo6.php b/src/Readers/Pairtwo6.php index 86f5aec..fe65a4c 100644 --- a/src/Readers/Pairtwo6.php +++ b/src/Readers/Pairtwo6.php @@ -887,11 +887,10 @@ class Pairtwo6 implements ReaderInterface $firstElement = new Tiebreak(Tiebreak::Keizer); break; case TournamentSystem::American: - $firstElement = new Tiebreak(Tiebreak::American); - break; case TournamentSystem::Closed: case TournamentSystem::Swiss: $firstElement = new Tiebreak(Tiebreak::Points); + break; } $tiebreaks = $this->getTournament()->getTiebreaks(); array_unshift($tiebreaks, $firstElement); diff --git a/src/Readers/Swar4.php b/src/Readers/Swar4.php index 31031e1..71cdd99 100644 --- a/src/Readers/Swar4.php +++ b/src/Readers/Swar4.php @@ -631,8 +631,6 @@ class Swar4 implements ReaderInterface { switch ($this->getTournament()->getSystem()) { case TournamentSystem::American: - $firstElement = new Tiebreak(Tiebreak::American); - break; case TournamentSystem::Closed: case TournamentSystem::Swiss: default: diff --git a/src/Tournament.php b/src/Tournament.php index 4a5c3be..360f72e 100644 --- a/src/Tournament.php +++ b/src/Tournament.php @@ -421,9 +421,6 @@ class Tournament case Tiebreak::Keizer: return $this->calculateKeizer($player); break; - case Tiebreak::American: - return $this->calculateAmerican($player); - break; case Tiebreak::Points: return $this->calculatePoints($player); break; @@ -528,19 +525,6 @@ class Tournament return $player->getBinaryData('ScoreAmerican'); } - - /** - * Points following american system - * - * @param Player $player - * @return float | null - */ - private function calculateAmerican(Player $player): ?float - { - return $player->getBinaryData('ScoreAmerican'); - } - - /** * Number of points * From 5b030a5c68077446b650fb608625fdcf46a20ac8 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Sat, 26 Oct 2019 23:30:04 +0200 Subject: [PATCH 2/2] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d34741..f5c7320 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## vx.y.z (Release: aa-bbb-cccc) * NEW FEATURE: `Game::getBoard()` for getting the board number of the game * CHANGE: Some fields has been renamed to match coding guideline (Please see [1ab96fa](https://github.com/JeroenED/libpairtwo/commit/1ab96fa04782c1b0f2b6bb9d1bac8397a74ab38e) for more info) +* REMOVED: `Tiebreak::American` and all its uses were removed (Please see [a6015ae](https://github.com/JeroenED/libpairtwo/commit/a6015ae8169f0973f4937605d0f807aacc233630) for more info) ## v1.2 (Release: 28-sep-2019) * NEW READER: `Readers\Swar-4` for reading out files created with SWAR version 4.