michaelcullum / voting-system

src/Michaelc/Voting/STV/Election.php

Indentation +93 added lines, -93 removed lines

@@ -6,99 +6,99 @@
 
 class Election
 {
-	/**
-	 * Count of candidates in election
-	 *
-	 * @var int
-	 */
-	protected $candidateCount;
-
-	/**
-	 * Count of number of seats/winners
-	 *
-	 * @var int
-	 */
-	protected $winnersCount;
-
-	/**
-	 * Array of candidates competing in election
-	 *
-	 * @var array
-	 */
-	protected $candidates;
-
-	/**
-	 * Array of ballots cast in election
-	 *
-	 * @var array
-	 */
-	protected $ballots;
-
-	/**
-	 * Constructor
-	 *
-	 * @param int   $winnersCount Number of winners to allocate
-	 * @param array $candidates   Array of candidates competing
-	 * @param array $ballots      Array of all ballots cast in election
-	 */
-	public function __construct(int $winnersCount, array $candidates, array $ballots)
-	{
-		$this->winnersCount = $winnersCount;
-		$this->candidates = $candidates;
-		$this->ballots = $ballots;
-		$this->candidateCount = count($candidates);
-	}
-
-	/**
-	 * Get a specific candidate object by their ID
-	 *
-	 * @param  int    $id    ID of the candidate to get
-	 * @return \Michaelc\Voting\STV\Candidate
-	 */
-	public function getCandidate(int $id): Candidate
-	{
-		return $this->candidates[$id];
-	}
-
-	/**
-	 * Get a count of candidates competing
-	 *
-	 * @return int
-	 */
-	public function getCandidateCount(): int
-	{
-		return $this->candidateCount;
-	}
-
-	/**
-	 * Get an array of candidates still running (not elected or defeated)
-	 *
-	 * @return \Michaelc\Voting\STV\Candidate[]
-	 */
-	public function getActiveCandidates(): array
-	{
-		$activeCandidates = [];
-
-		foreach ($this->candidates as $candidateId => $candidate)
-		{
-			if ($candidate->getState() == Candidate::RUNNING)
-			{
-				$activeCandidates[$candidateId] = $candidate;
-			}
-		}
-
-		return $activeCandidates;
-	}
-
-	/**
-	 * Get a count of candidates still running (not elected or defeated)
-	 *
-	 * @return int
-	 */
-	public function getActiveCandidateCount(): int
-	{
-		return count($this->getActiveCandidates());
-	}
+    /**
+     * Count of candidates in election
+     *
+     * @var int
+     */
+    protected $candidateCount;
+
+    /**
+     * Count of number of seats/winners
+     *
+     * @var int
+     */
+    protected $winnersCount;
+
+    /**
+     * Array of candidates competing in election
+     *
+     * @var array
+     */
+    protected $candidates;
+
+    /**
+     * Array of ballots cast in election
+     *
+     * @var array
+     */
+    protected $ballots;
+
+    /**
+     * Constructor
+     *
+     * @param int   $winnersCount Number of winners to allocate
+     * @param array $candidates   Array of candidates competing
+     * @param array $ballots      Array of all ballots cast in election
+     */
+    public function __construct(int $winnersCount, array $candidates, array $ballots)
+    {
+        $this->winnersCount = $winnersCount;
+        $this->candidates = $candidates;
+        $this->ballots = $ballots;
+        $this->candidateCount = count($candidates);
+    }
+
+    /**
+     * Get a specific candidate object by their ID
+     *
+     * @param  int    $id    ID of the candidate to get
+     * @return \Michaelc\Voting\STV\Candidate
+     */
+    public function getCandidate(int $id): Candidate
+    {
+        return $this->candidates[$id];
+    }
+
+    /**
+     * Get a count of candidates competing
+     *
+     * @return int
+     */
+    public function getCandidateCount(): int
+    {
+        return $this->candidateCount;
+    }
+
+    /**
+     * Get an array of candidates still running (not elected or defeated)
+     *
+     * @return \Michaelc\Voting\STV\Candidate[]
+     */
+    public function getActiveCandidates(): array
+    {
+        $activeCandidates = [];
+
+        foreach ($this->candidates as $candidateId => $candidate)
+        {
+            if ($candidate->getState() == Candidate::RUNNING)
+            {
+                $activeCandidates[$candidateId] = $candidate;
+            }
+        }
+
+        return $activeCandidates;
+    }
+
+    /**
+     * Get a count of candidates still running (not elected or defeated)
+     *
+     * @return int
+     */
+    public function getActiveCandidateCount(): int
+    {
+        return count($this->getActiveCandidates());
+    }
 
     /**
      * Gets the value of winnersCount.

src/Michaelc/Voting/STV/Candidate.php

Indentation +42 added lines, -42 removed lines

@@ -4,48 +4,48 @@
 
 class Candidate
 {
-	const ELECTED = 1;
-  	const RUNNING = 2;
-  	const DEFEATED = 3;
-
-  	/**
-  	 * Identifier for the candidate
-  	 *
-  	 * @var integer
-  	 */
-  	protected $id;
-
-  	/**
-  	 * Number of votes the candidate currently has
-  	 *
-  	 * @var float
-  	 */
-	protected $votes;
-
-	/**
-	 * Number of surplus votes the candidate has to be re-allocated
-	 *
-	 * @var float
-	 */
-	protected $surplus;
-
-	/**
-	 * State of the candidate (use class constants)
-	 *
-	 * @var integer
-	 */
-	protected $state;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct(int $id)
-	{
-		$this->id = $id;
-		$this->votes = 0.0;
-		$this->surplus = 0.0;
-		$this->state = self::RUNNING;
-	}
+    const ELECTED = 1;
+        const RUNNING = 2;
+        const DEFEATED = 3;
+
+        /**
+         * Identifier for the candidate
+         *
+         * @var integer
+         */
+        protected $id;
+
+        /**
+         * Number of votes the candidate currently has
+         *
+         * @var float
+         */
+    protected $votes;
+
+    /**
+     * Number of surplus votes the candidate has to be re-allocated
+     *
+     * @var float
+     */
+    protected $surplus;
+
+    /**
+     * State of the candidate (use class constants)
+     *
+     * @var integer
+     */
+    protected $state;
+
+    /**
+     * Constructor
+     */
+    public function __construct(int $id)
+    {
+        $this->id = $id;
+        $this->votes = 0.0;
+        $this->surplus = 0.0;
+        $this->state = self::RUNNING;
+    }
 
     /**
      * Gets the Identifier for the candidate.