Solver: added solutions as class properties

Simplex/Solver.php

@@ -30,6 +30,12 @@ final class Solver
 	/** @var int */
 	private $maxSteps;
 
+	/** @var array<string, Fraction> */
+	private $solution;
+
+	/** @var array<int, array<string, Fraction>>|null */
+	private $alternativeSolutions;
+
 
 	/** @param  int $maxSteps */
 	public function __construct(Task $task, $maxSteps = 16)
@@ -70,14 +76,7 @@ public function getSteps()
 	/** @return array<string, Fraction>|false|null */
 	public function getSolution()
 	{
-		// find first table with a solution in steps
-		foreach ($this->steps as $step) {
-			if ($step->isSolved()) {
-				return $step->getSolution();
-			}
-		}
-
-		return null;
+		return $this->solution;
 	}
 
 
@@ -100,21 +99,7 @@ public function getSolutionValue(array $solution)
 	/** @return array<string, Fraction>|null */
 	public function getAlternativeSolutions()
 	{
-		$first = false;
-		$alternatives = array();
-
-		foreach ($this->steps as $step) {
-			if ($step->isSolved()) {
-				if (!$first) {
-					$first = true;
-					continue ;
-				}
-
-				$alternatives[] = $step->getSolution();
-			}
-		}
-
-		return $first ? $alternatives : null;
+		return $this->alternativeSolutions;
 	}
 
 
@@ -140,8 +125,16 @@ private function solve(Task $task)
 			}
 		}
 
+		$this->solution = $tbl->getSolution();
+
 		if ($tbl->hasAlternativeSolution()) {
-			$this->steps[] = $tbl->getAlternativeSolution();
+			$altSolutionTbl = $tbl->getAlternativeSolution();
+
+			$this->steps[] = $altSolutionTbl;
+			$this->alternativeSolutions = array($altSolutionTbl->getSolution());
+
+		} elseif ($tbl->hasSolution()) {
+			$this->alternativeSolutions = array();
 		}
 	}