michaelcullum / voting-system

src/Michaelc/Voting/STV/Ballot.php

Indentation +29 added lines, -29 removed lines

@@ -4,38 +4,38 @@
 
 class Ballot
 {
-	/**
-	 * Ranking of candidates ids
-	 *
-	 * @var array
-	 */
-	protected $ranking;
+    /**
+     * Ranking of candidates ids
+     *
+     * @var array
+     */
+    protected $ranking;
 
-	/**
-	 * The current weighting or value of this person's vote
-	 *
-	 * @var float
-	 */
-	protected $weight;
+    /**
+     * The current weighting or value of this person's vote
+     *
+     * @var float
+     */
+    protected $weight;
 
-	/**
-	 * The current preference in use from this ballot
-	 *
-	 * @var integer
-	 */
-	protected $levelUsed;
+    /**
+     * The current preference in use from this ballot
+     *
+     * @var integer
+     */
+    protected $levelUsed;
 
-	/**
-	 * Constructor
-	 *
-	 * @param array $ranking The ranking of candidates Key being ranking,
-	 *                       value being a candidate id
-	 */
-	public function __construct(array $ranking)
-	{
-	    $this->weight = 1.0;
-	    $this->ranking = $ranking;
-	    $this->levelUsed = 0;
+    /**
+     * Constructor
+     *
+     * @param array $ranking The ranking of candidates Key being ranking,
+     *                       value being a candidate id
+     */
+    public function __construct(array $ranking)
+    {
+        $this->weight = 1.0;
+        $this->ranking = $ranking;
+        $this->levelUsed = 0;
     }
 
     /**

src/AppBundle/Utils/ElectionManager.php

Indentation +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 
     public function calculateElectionResult(Poll $poll): array
     {
-    	return getElectionResults($poll);
+        return getElectionResults($poll);
     }
 
     public function submitVotes(array $choices)
@@ -43,12 +43,12 @@ 
 
     public function getElectionPollVotes(Poll $poll): array
     {
-    	return [];
+        return [];
     }
 
     public function getElectionResults(Poll $poll): array
     {
-    	return [];
+        return [];
     }
 
     public function getElectionWinner(Poll $poll): AppBundle\Entity\Choice

src/AppBundle/Utils/PollManager.php

Indentation +22 added lines, -22 removed lines

@@ -11,19 +11,19 @@ 
     protected $pollRepo;
     protected $electionManager;
 
-	/**
-	 * Constructor
-	 *
-	 * @param EntityManager $entityManager
-	 */
-	public function __construct(EntityManager $entityManager, ElectionManager $electionManager)
-	{
-		$this->entityManager = $entityManager;
-		$this->repo = $this->entityManager->getRepository('AppBundle:Poll');
+    /**
+     * Constructor
+     *
+     * @param EntityManager $entityManager
+     */
+    public function __construct(EntityManager $entityManager, ElectionManager $electionManager)
+    {
+        $this->entityManager = $entityManager;
+        $this->repo = $this->entityManager->getRepository('AppBundle:Poll');
         $this->electionManager = $electionManager;
-	}
+    }
 
-	/**
+    /**
      * Get an array of current polls (objects)
      *
      * @return array
@@ -43,7 +43,7 @@ 
      */
     public function getEligibleVoters(PollType $type): array
     {
-    	return [];
+        return [];
     }
 
     /**
@@ -53,9 +53,9 @@ 
      */
     public function getAllPolls(): array
     {
-    	$polls = $this->repo->findAll();
+        $polls = $this->repo->findAll();
 
-    	return $polls;
+        return $polls;
     }
 
     /**
@@ -66,10 +66,10 @@ 
      */
     public function getPollStats(Poll $poll): array
     {
-    	// If Poll is election then reject
+        // If Poll is election then reject
 
-    	// Get standard stats
-    	return [];
+        // Get standard stats
+        return [];
     }
 
     /**
@@ -80,19 +80,19 @@ 
      */
     public function getPollResult(Poll $poll): Choice
     {
-    	// If election then call Election Manager
+        // If election then call Election Manager
 
-    	// Calculate winning choice
-    	return;
+        // Calculate winning choice
+        return;
     }
 
     public function getStandardPollVotes(Poll $poll): array
     {
-    	return [];
+        return [];
     }
 
     public function markPollClosed(Poll $poll)
     {
-    	return;
+        return;
     }
 }

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.