Merge pull request #272 from kaorahi/komi_sgf

Fix issues on komi and handicap in SGF reader
featurecat · Jun 2, 2018 · 1912f4a · 1912f4a
2 parents a2873d6 + 153c4e7
commit 1912f4a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/featurecat/lizzie/rules/Board.java b/src/main/java/featurecat/lizzie/rules/Board.java
@@ -283,8 +283,10 @@ public void flatten() {
          Stone[] stones = history.getStones();
          boolean blackToPlay = history.isBlacksTurn();
          Zobrist zobrist = history.getZobrist().clone();
+         BoardHistoryList oldHistory = history;
          history = new BoardHistoryList(new BoardData(stones, null, Stone.EMPTY, blackToPlay, zobrist,
                                                       0, new int[BOARD_SIZE * BOARD_SIZE], 0, 0, 0.0, 0));
+         history.setGameInfo(oldHistory.getGameInfo());
      }
 
     /**

diff --git a/src/main/java/featurecat/lizzie/rules/BoardHistoryList.java b/src/main/java/featurecat/lizzie/rules/BoardHistoryList.java
@@ -25,6 +25,10 @@ public GameInfo getGameInfo() {
         return gameInfo;
     }
 
+    public void setGameInfo(GameInfo gameInfo) {
+        this.gameInfo = gameInfo;
+    }
+
     /**
      * Clear history.
      */

diff --git a/src/main/java/featurecat/lizzie/rules/SGFParser.java b/src/main/java/featurecat/lizzie/rules/SGFParser.java
@@ -164,7 +164,14 @@ private static boolean parse(String value) {
                     } else if (tag.equals("PW")) {
                         whitePlayer = tagContent;
                     }  else if (tag.equals("KM")) {
-                        Lizzie.board.getHistory().getGameInfo().setKomi(Double.parseDouble(tagContent));
+                        try {
+                            if (tagContent.trim().isEmpty()) {
+                                tagContent = "0.0";
+                            }
+                            Lizzie.board.getHistory().getGameInfo().setKomi(Double.parseDouble(tagContent));
+                        } catch (NumberFormatException e) {
+                            e.printStackTrace();
+                        }
                     }
                     break;
                 case ';':