Refactored Chess\Function\AbstractFunction

chesslablab · Dec 19, 2024 · d9eba7d · d9eba7d
1 parent 91b6ae8
commit d9eba7d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/src/EvalFactory.php b/src/EvalFactory.php
@@ -9,7 +9,7 @@ class EvalFactory
 {
     public static function create(AbstractFunction $function, string $name, AbstractBoard $board)
     {
-        foreach ($function->getEval() as $val) {
+        foreach ($function->eval as $val) {
             $class = new \ReflectionClass($val);
             if ($name === $class->getConstant('NAME')) {
                 return $class->newInstanceArgs([$board]);

diff --git a/src/FenHeuristics.php b/src/FenHeuristics.php
@@ -34,7 +34,7 @@ class FenHeuristics
      */
     public function __construct(AbstractFunction $function, AbstractBoard $board)
     {
-        foreach ($function->getEval() as $val) {
+        foreach ($function->eval as $val) {
             $eval = new $val($board);
             $item = $eval->result;
             if (is_array($item[Color::W])) {

diff --git a/src/Function/AbstractFunction.php b/src/Function/AbstractFunction.php
@@ -4,11 +4,6 @@
 
 abstract class AbstractFunction
 {
-    public function getEval(): array
-    {
-        return $this->eval;
-    }
-
     public function names(): array
     {
         foreach ($this->eval as $val) {

diff --git a/src/Function/FastFunction.php b/src/Function/FastFunction.php
@@ -36,7 +36,7 @@
 
 class FastFunction extends AbstractFunction
 {
-    protected array $eval = [
+    public array $eval = [
         MaterialEval::class,
         CenterEval::class,
         ConnectivityEval::class,

diff --git a/src/Tutor/FenEvaluation.php b/src/Tutor/FenEvaluation.php
@@ -26,7 +26,7 @@ private function fenExplanation(): array
     {
         $paragraph = [];
 
-        foreach ($this->function->getEval() as $val) {
+        foreach ($this->function->eval as $val) {
             $eval = new $val($this->board);
             if (in_array(ExplainEvalTrait::class, class_uses($eval))) {
                 if ($phrases = $eval->explain()) {
@@ -42,7 +42,7 @@ private function fenElaboration(): array
     {
         $paragraph = [];
 
-        foreach ($this->function->getEval() as $val) {
+        foreach ($this->function->eval as $val) {
             $eval = new $val($this->board);
             if (in_array(ElaborateEvalTrait::class, class_uses($eval))) {
                 if ($phrases = $eval->elaborate()) {