Refactored Chess\Heuristics\FenHeuristics

src/Function/LinearComplexityFunction.php

@@ -56,7 +56,6 @@ class LinearComplexityFunction extends AbstractFunction
         PressureEval::class,
         KingSafetyEval::class,
         ProtectionEval::class,
-        AttackEval::class,
         DiscoveredCheckEval::class,
         DoubledPawnEval::class,
         PassedPawnEval::class,

src/Heuristics/FenHeuristics.php

@@ -3,7 +3,7 @@
 namespace Chess\Heuristics;
 
 use Chess\Eval\InverseEvalInterface;
-use Chess\Function\QuadraticComplexityFunction;
+use Chess\Function\AbstractFunction;
 use Chess\Variant\Classical\Board;
 use Chess\Variant\Classical\PGN\AN\Color;
 
@@ -28,9 +28,9 @@ class FenHeuristics
     /**
      * The evaluation function.
      *
-     * @var \Chess\Function\QuadraticComplexityFunction
+     * @var \Chess\Function\AbstractFunction
      */
-    protected QuadraticComplexityFunction $function;
+    protected AbstractFunction $function;
 
     /**
      * The result.
@@ -50,12 +50,13 @@ class FenHeuristics
      * Constructor.
      *
      * @param \Chess\Variant\Classical\Board $board
+     * @param \Chess\Variant\Classical\AbstractFunction $function
      */
-    public function __construct(Board $board)
+    public function __construct(Board $board, AbstractFunction $function)
     {
         $this->board = $board;
 
-        $this->function = new QuadraticComplexityFunction();
+        $this->function = $function;
 
         $this->calc()->balance();
     }

tests/unit/Heuristics/FenHeuristicsTest.php

@@ -4,6 +4,7 @@
 
 use Chess\FenToBoardFactory;
 use Chess\Heuristics\FenHeuristics;
+use Chess\Function\QuadraticComplexityFunction;
 use Chess\Tests\AbstractUnitTestCase;
 use Chess\Variant\Capablanca\Board as CapablancaBoard;
 
@@ -18,7 +19,9 @@ public function get_balance_start()
 
         $board = FenToBoardFactory::create($fen);
 
-        $balance = (new FenHeuristics($board))->getBalance();
+        $function = new QuadraticComplexityFunction();
+
+        $balance = (new FenHeuristics($board, $function))->getBalance();
 
         $expected = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ];
 
@@ -34,7 +37,9 @@ public function get_balance_e4()
 
         $board = FenToBoardFactory::create($fen);
 
-        $balance = (new FenHeuristics($board))->getBalance();
+        $function = new QuadraticComplexityFunction();
+
+        $balance = (new FenHeuristics($board, $function))->getBalance();
 
         $expected = [ 0.0, 12.0, -4.0, 8.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ];
 
@@ -50,7 +55,9 @@ public function get_balance_e4_e5()
 
         $board = FenToBoardFactory::create($fen);
 
-        $balance = (new FenHeuristics($board))->getBalance();
+        $function = new QuadraticComplexityFunction();
+
+        $balance = (new FenHeuristics($board, $function))->getBalance();
 
         $expected = [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ];
 
@@ -66,7 +73,9 @@ public function get_balance_e4_e5_Nf3_Nf6()
 
         $board = FenToBoardFactory::create($fen);
 
-        $balance = (new FenHeuristics($board))->getBalance();
+        $function = new QuadraticComplexityFunction();
+
+        $balance = (new FenHeuristics($board, $function))->getBalance();
 
         $expected = [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ];
 
@@ -82,9 +91,11 @@ public function get_balance_A59()
 
         $board = FenToBoardFactory::create($fen);
 
-        $balance = (new FenHeuristics($board))->getBalance();
+        $function = new QuadraticComplexityFunction();
 
-        $expected = [ 1.0, 9.0, -1.0, 4.0, -3.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 0.0, -5.1, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 0.0, 0.0 ];
+        $balance = (new FenHeuristics($board, $function))->getBalance();
+
+        $expected = [ 1.0, 9.0, -1.0, 4.0, -3.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 0.0, -5.1, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 0.0, 0.0, 0.0 ];
 
         $this->assertEquals($expected, $balance);
     }
@@ -98,9 +109,11 @@ public function get_balance_scholar_checkmate()
 
         $board = FenToBoardFactory::create($fen);
 
-        $balance = (new FenHeuristics($board))->getBalance();
+        $function = new QuadraticComplexityFunction();
+
+        $balance = (new FenHeuristics($board, $function))->getBalance();
 
-        $expected = [ 1.0, 5.66, -12.0, 2.0, 3.0, 4.0, -1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 0.0, 0.0 ];
+        $expected = [ 1.0, 5.66, -12.0, 2.0, 3.0, 4.0, -1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 0.0, 0.0, 0.0 ];
 
         $this->assertEquals($expected, $balance);
     }
@@ -114,7 +127,9 @@ public function capablanca_f4()
 
         $board = FenToBoardFactory::create($fen, new CapablancaBoard());
 
-        $balance = (new FenHeuristics($board))->getBalance();
+        $function = new QuadraticComplexityFunction();
+
+        $balance = (new FenHeuristics($board, $function))->getBalance();
 
         $expected = [ 0.0, 12.0, -3.0, 9.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ];