Handle handicapped games

Author: Anthony Burzillo

reformat.hs

@@ -20,20 +20,33 @@ parens     = Token.parens lexer
 brackets   = Token.brackets lexer
 semi       = Token.semi lexer
 semiSep    = Token.semiSep lexer
+whiteSpace = Token.whiteSpace lexer
 
 type Position = (Int, Int)
-type DataPoint = (String, String)
-type HeaderInfo = (Double, Double)
-data Game = Game Double Double [Position]
+type DataPoint = (String, [String])
+type HeaderInfo = (Double, Double, [Position])
+data Game = Game Double Double [Position] [Position]
+
+skipParentheses :: Parser ()
+skipParentheses = do
+    many $ noneOf ['(', ')']
+    (char ')' *> return ())
+        <|> (char '(' *> skipParentheses *> skipParentheses)
+        <|> skipParentheses
 
 dataPoint :: Parser DataPoint
 dataPoint = do
     dataType <- identifier
-    argument <- brackets . many $ noneOf [']']
+    argument <- many1 . brackets . many $ (try $ char '\\' *> char ']') <|> noneOf [']']
     return $ (dataType, argument)
 
+dataPoints :: Parser [DataPoint]
+dataPoints = many $ (try $ (many $ char '(' *> skipParentheses *> whiteSpace) *> dataPoint)
+    <|> dataPoint
+
 convertMove :: String -> Position
 convertMove (x : y : _) = (ord x - 97, ord y - 97)
+convertMove _ = (19, 19)
 
 validateMove :: Position -> Parser Position
 validateMove (x, y) = if (x, y) >= (0, 0) && (x, y) <= (19, 19)
@@ -42,47 +55,57 @@ validateMove (x, y) = if (x, y) >= (0, 0) && (x, y) <= (19, 19)
 
 move :: Parser Position
 move = do
-    dataPoints <- many dataPoint
-    validateMove $ foldr find (0, 0) dataPoints
-    where find (f, a) r = if f == "W"
-            then convertMove a
+    dps <- dataPoints
+    validateMove $ foldr find (0, 0) dps
+    where find (f, as) r = if f == "W"
+            then case as of (a : _) -> convertMove a
             else if f == "B"
-                then convertMove a
+                then case as of (a : _) -> convertMove a
                 else r
 
-convertScore :: String -> Maybe Double
-convertScore (c : _ : s) = if c == 'B'
+readScore :: String -> Maybe Double
+readScore (c : _ : s) = if c == 'B'
     then readMaybe s >>= \x -> Just $ -1.0 * x
     else readMaybe s
 
+readHandicapPositions :: [String] -> Parser [Position]
+readHandicapPositions as = mapM (validateMove . convertMove) as
+
 header :: Parser HeaderInfo
 header = do
     dataPoints <- many dataPoint
-    let r = foldr find (Nothing, Nothing) dataPoints
+    let r = foldr find (Nothing, Nothing, Nothing) dataPoints
     case r of
-        (Nothing, _) -> fail "Couldn't read komi"
-        (_, Nothing) -> fail "No final score"
-        (Just k, Just s) -> return (k, s)
-    where find (f, a) (k, s) = if f == "KM"
-            then (readMaybe a, s)
+        (Nothing, _, _) -> fail "Couldn't read komi"
+        (_, Nothing, _) -> fail "Couldn't read final score"
+        (Just k, Just s, Nothing) -> return (k, s, [])
+        (Just k, Just s, Just as) -> do
+            hp <- readHandicapPositions as
+            return (k, s, hp)
+    where find (f, as) (k, s, hp) = if f == "KM"
+            then case as of (a : _) -> (readMaybe a, s, hp)
             else if f == "RE"
-                then (k, convertScore a)
-                else (k, s)
-    
+                then case as of (a : _) -> (k, readScore a, hp)
+                else if f == "AB"
+                    then (k, s, Just as)
+                    else (k, s, hp)
+
 game :: Parser Game
 game = parens $ semi *> do
-    (komi, score) <- header
+    (komi, score, handicapPositions) <- header
     semi
     moves <- semiSep move
-    return $ Game komi score moves
+    many $ char '(' *> skipParentheses *> whiteSpace
+    return $ Game komi score handicapPositions moves
 
 parseFile :: FilePath -> IO (Either ParseError Game)
-parseFile f = parseFromFile (game <* eof) f
+parseFile f = parseFromFile game f
 
 instance Show Game where
-    show (Game komi score moves) =
-        let h = show komi ++ " " ++ show score
-        in h ++ foldr runMoves "" moves
+    show (Game komi score handicaps moves) =
+        let h = show komi ++ " " ++ show score ++ " " ++ show (length handicaps)
+        in let h' = h ++ foldr runMoves "" handicaps
+        in h' ++ foldr runMoves "" moves
         where runMoves (x, y) r = "\n" ++ show x ++ " " ++ show y ++ r
 
 main = do

src/game.cpp

@@ -36,7 +36,12 @@ float Game::getFinalScore(void) const
     return finalScore;
 }
 
-void Game::addMove(const BoardLocation location)
+void Game::addHandicap(const BoardLocation& location)
+{
+    handicap.push_back(location);
+}
+
+void Game::addMove(const BoardLocation& location)
 {
     moves.push_back(location);
 }
@@ -45,11 +50,25 @@ Board Game::playGame(void) const
 {
     Board board(size, komi);
 
-    std::vector<BoardLocation>::const_iterator itt = moves.begin();
-
     int i = 1;
 
-    for( ; itt != moves.end(); ++itt)
+    if(handicap.size() > 0)
+    {
+        std::vector<BoardLocation>::const_iterator handicapItt = handicap.begin();
+        std::vector<BoardLocation>::const_iterator handicapEnd = handicap.end();
+
+        for( ; handicapItt != handicapEnd; ++handicapItt)
+        {
+            board.playMove(handicapItt->x, handicapItt->y, BLACK);
+        }
+
+        ++i;
+    }
+
+    std::vector<BoardLocation>::const_iterator itt = moves.begin();
+    std::vector<BoardLocation>::const_iterator end = moves.end();
+
+    for( ; itt != end; ++itt)
     {
         SpaceState state = i % 2 == 1 ? BLACK : WHITE;
 

src/game.h

@@ -14,6 +14,7 @@ class Game
     int size;
     float komi;
     float finalScore;
+    std::vector<BoardLocation> handicap;
     std::vector<BoardLocation> moves;
     std::map<Block*, float*> featureMap;
   public:
@@ -24,7 +25,8 @@ class Game
     float getKomi(void) const;
     float getFinalScore(void) const;
 
-    void addMove(const BoardLocation location);
+    void addHandicap(const BoardLocation& location);
+    void addMove(const BoardLocation& location);
 
     Board playGame(void) const;
 

src/parser.cpp

@@ -13,8 +13,9 @@ bool parseFile(Game* game, const char *filename, const int size)
 
     float komi;
     float finalScore;
+    int handicapStones;
 
-    if(fscanf(file, "%f %f", &komi, &finalScore) == EOF)
+    if(fscanf(file, "%f %f %i", &komi, &finalScore, &handicapStones) == EOF)
     {
         fclose(file);
 
@@ -26,6 +27,20 @@ bool parseFile(Game* game, const char *filename, const int size)
     int x;
     int y;
 
+    for(int i = 0; i < handicapStones; ++i)
+    {
+        if(fscanf(file, "%i %i", &x, &y) == EOF)
+        {
+            fclose(file);
+
+            return false;
+        }
+
+        BoardLocation location(x, y);
+
+        result.addHandicap(location);
+    }
+
     while(fscanf(file, "%i %i", &x, &y) != EOF)
     {
         BoardLocation location(x, y);