Improve hard computer skill

Author: sloenthran

src/main/java/pl/nogacz/chess/application/BoardPoint.java

@@ -0,0 +1,59 @@
+package pl.nogacz.chess.application;
+
+import pl.nogacz.chess.board.Board;
+import pl.nogacz.chess.board.Coordinates;
+import pl.nogacz.chess.pawns.Pawn;
+import pl.nogacz.chess.pawns.PawnClass;
+import pl.nogacz.chess.pawns.moves.PawnMoves;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Dawid Nogacz on 14.05.2019
+ */
+public class BoardPoint {
+    public int calculateBoard() {
+        HashMap<Coordinates, PawnClass> cacheBoard = new HashMap<>(Board.getBoard());
+
+        int whitePoint = 0;
+        int blackPoint = 0;
+
+        for(Map.Entry<Coordinates, PawnClass> entry : cacheBoard.entrySet()) {
+            if(entry.getValue().getColor().isWhite()) {
+                whitePoint += calculatePawn(entry.getKey(), entry.getValue());
+            } else {
+                blackPoint += calculatePawn(entry.getKey(), entry.getValue());
+            }
+        }
+
+        return blackPoint - whitePoint;
+    }
+
+    private int calculatePawn(Coordinates coordinates, PawnClass pawn) {
+        int point = 1;
+
+        PawnMoves pawnMoves = new PawnMoves(pawn, coordinates);
+
+        if(pawnMoves.getPossibleCheck().size() > 0) {
+            point += 100;
+        } else if(pawnMoves.getPossibleKick().size() > 0) {
+            point += 20;
+        }
+
+        if(pawn.getColor().isWhite() && pawn.getPawn() == Pawn.PAWN && coordinates.getY() > 4) {
+            point++;
+        } else if(pawn.getColor().isBlack() && pawn.getPawn() == Pawn.PAWN && coordinates.getY() < 4) {
+            point++;
+        }
+
+        switch(pawn.getPawn()) {
+            case QUEEN: point += 7; break;
+            case KNIGHT: point += 3; break;
+            case ROOK: point += 2; break;
+            case BISHOP: point += 2; break;
+        }
+
+        return point;
+    }
+}

src/main/java/pl/nogacz/chess/application/Computer.java

@@ -24,6 +24,8 @@ public class Computer {
     private Set<Coordinates> possibleMoves = new HashSet<>();
     private Set<Coordinates> possibleKickAndNotIsEnemyKickMe = new HashSet<>();
 
+    private BoardPoint boardPoint = new BoardPoint();
+
     public Computer() {
         if (isExists()) {
             load();
@@ -99,6 +101,7 @@ public void getGameData() {
     public Coordinates choosePawn() {
         switch (skill) {
             case 1: return choosePawnEasy();
+            case 2: return choosePawnHard();
             default: return choosePawnNormal();
         }
     }
@@ -128,6 +131,59 @@ private Coordinates choosePawnNormal() {
         return (Coordinates) object[random.nextInt(object.length)];
     }
 
+    private Coordinates choosePawnHard() {
+        int minNumber = -1000;
+
+        Set<Coordinates> cachePawn = new HashSet<>();
+        cachePawn.addAll(possibleKick);
+        cachePawn.addAll(possibleMoves);
+
+        Set<Coordinates> cachePossiblePawn = new HashSet<>();
+
+        for(Coordinates coordinates : cachePawn) {
+
+            PawnMoves moves = new PawnMoves(Board.getPawn(coordinates), coordinates);
+
+            Set<Coordinates> cacheMoves = new HashSet<>();
+            cacheMoves.addAll(moves.getPossibleKick());
+            cacheMoves.addAll(moves.getPossibleMoves());
+
+            for(Coordinates moveCoordinates : cacheMoves) {
+                PawnClass oldPawn = Board.addPawnWithoutDesign(moveCoordinates, Board.getPawn(coordinates));
+
+                int point = boardPoint.calculateBoard();
+
+                if(point > minNumber) {
+                    minNumber = point;
+                }
+
+                Board.removePawnWithoutDesign(moveCoordinates);
+
+                if (oldPawn != null) {
+                    Board.addPawnWithoutDesign(moveCoordinates, oldPawn);
+                }
+            }
+
+            for(Coordinates moveCoordinates : cacheMoves) {
+                PawnClass oldPawn = Board.addPawnWithoutDesign(moveCoordinates, Board.getPawn(coordinates));
+
+                int point = boardPoint.calculateBoard();
+
+                if(point == minNumber) {
+                    cachePossiblePawn.add(coordinates);
+                }
+
+                Board.removePawnWithoutDesign(moveCoordinates);
+
+                if (oldPawn != null) {
+                    Board.addPawnWithoutDesign(moveCoordinates, oldPawn);
+                }
+            }
+        }
+
+        return (Coordinates) cachePossiblePawn.toArray()[random.nextInt(cachePossiblePawn.size())];
+    }
+
     public Coordinates chooseMove(Coordinates coordinates) {
         switch (skill) {
             case 1: return chooseMoveEasy(coordinates);

src/main/java/pl/nogacz/chess/application/GameLogic.java

@@ -60,8 +60,6 @@ public boolean isMovePossible() {
             possibleMovesWhite.clear();
         }
 
-        System.out.println(pawnWhiteCount);
-
         return possibleMovesWhite.size() > 0 && possibleMovesBlack.size() > 0;
     }