introduce Match class

Author: technohippy

Diff for: .gitignore

@@ -1,4 +1,5 @@
-go-go
+go
 *.swp
 *.swo
 *.6
+todo.txt

Diff for: Makefile

@@ -2,7 +2,8 @@ include $(GOROOT)/src/Make.inc
 
 TARG=go
 GOFILES=src/go/go.go
-O_FILES=point.$O cell.$O history.$O board.$O player.$O console_player.$O auto_player.$O server.$O go.$O
+#O_FILES=point.$O cell.$O history.$O board.$O player.$O console_player.$O auto_player.$O  match.$0 server.$O go.$O
+O_FILES=point.$O cell.$O history.$O board.$O player.$O console_player.$O match.$O server.$O go.$O
 
 all: $(O_FILES)
 install: $(O_FILES)
@@ -27,8 +28,11 @@ player.$O:
 console_player.$O:
 	$(QUOTED_GOBIN)/$(GC) -o console_player.$O src/go/console_player.go
 
-auto_player.$O:
-	$(QUOTED_GOBIN)/$(GC) -o auto_player.$O src/go/auto_player.go
+#auto_player.$O:
+#	$(QUOTED_GOBIN)/$(GC) -o auto_player.$O src/go/auto_player.go
+
+match.$O:
+	$(QUOTED_GOBIN)/$(GC) -o match.$O src/go/match.go
 
 server.$O:
 	$(QUOTED_GOBIN)/$(GC) -o server.$O src/go/server.go

Diff for: src/go/auto_player.go

@@ -21,6 +21,14 @@ func (cp *AutoPlayer)Teban() player.Teban {
   return cp.teban
 }
 
+func (cp *ConsolePlayer)SetTeban(t player.Teban) {
+  cp.teban = t
+}
+
 func (cp *AutoPlayer)Next(b *board.Board) player.Status {
   return player.GIVEUP
 }
+
+func (cp *AutoPlayer)Next2(b *board.Board, h *history.History, agehama [2]int) Status {
+  return cp.Next(b)
+}

Diff for: src/go/console_player.go

@@ -9,6 +9,7 @@ import (
   "./cell"
   "./board"
   "./player"
+  "./history"
 )
 
 type ConsolePlayer struct {
@@ -28,7 +29,9 @@ func (cp *ConsolePlayer)Teban() player.Teban {
   return cp.teban
 }
 
-func (cp *ConsolePlayer)Next(b *board.Board) player.Status {
+func (cp *ConsolePlayer)Next(b *board.Board, h *history.History, agehama [2]int) *player.Response {
+  res := new(player.Response)
+
   r := bufio.NewReader(os.Stdin)
   re := regexp.MustCompile("[0-9]+")
   var color cell.Cell
@@ -45,19 +48,24 @@ func (cp *ConsolePlayer)Next(b *board.Board) player.Status {
     if len(xy) < 2 {
       b.Pass(color)
       fmt.Printf("[%s] Pass!\n", cp.name)
-      return player.PASS
-    }
-    x, _ := strconv.Atoi(xy[0])
-    y, _ := strconv.Atoi(xy[1])
-    takenOffs, ok := b.PutAt(color, x, y)
-    if ok == board.OK {
-      fmt.Printf("[%s] Put (%d, %d) and Take %d\n", cp.name, x, y, len(takenOffs))
-      break
-    } else if ok == board.KO {
-      fmt.Printf("[%s] Kou\n", cp.name)
-    } else if ok == board.FORBIDDEN {
-      fmt.Printf("[%s] Forbidden\n", cp.name)
+      res.Status = player.PASS
+    } else {
+      x, _ := strconv.Atoi(xy[0])
+      y, _ := strconv.Atoi(xy[1])
+      takenOffs, ok := b.PutAt(color, x, y)
+      if ok == board.OK {
+        fmt.Printf("[%s] Put (%d, %d) and Take %d\n", cp.name, x, y, len(takenOffs))
+        res.Status = player.PUT
+        res.Data = map[string]interface{}{"x":x, "y":y, "taken":takenOffs}
+        break
+      } else if ok == board.KO {
+        fmt.Printf("[%s] Ko\n", cp.name)
+        res.Status = player.KO
+      } else if ok == board.FORBIDDEN {
+        fmt.Printf("[%s] Forbidden\n", cp.name)
+        res.Status = player.FORBIDDEN
+      }
     }
   }
-  return player.PUT
+  return res
 }

Diff for: src/go/go.go

@@ -4,40 +4,49 @@ import (
   "os"
   "fmt"
   "flag"
+  "./match"
   "./board"
   "./player"
   "./server"
   "./console_player"
   //"./auto_player"
 )
 
-func startConsole(b *board.Board, ps [2]player.Player) {
+func startConsole(b *board.Board) {
+  players := [2]player.Player{
+    console_player.New("ando", player.SENTE),
+    console_player.New("yasushi", player.GOTE)}
+  m := match.New(b, players)
+
   fmt.Printf("%v", b)
-  turn := 0
-  pass := false
   for {
-    switch ps[turn].Next(b) {
+    matchStatus, playerStatus := m.Next()
+    switch playerStatus {
       case player.PUT:
         fmt.Printf("%v", b)
-        pass = false
+      case player.KO:
+        fmt.Printf("Ko", b)
+      case player.FORBIDDEN:
+        fmt.Printf("Forbidden", b)
       case player.PASS:
-        if pass {
+        if matchStatus == match.FINISH {
           fmt.Println("Finish!")
           os.Exit(0)
-        } else {
-          pass = true
         }
       case player.GIVEUP:
-        fmt.Printf("%s Win!\n", ps[turn].Name())
+        fmt.Printf("%s Win!\n", (*m.Winner).Name())
         os.Exit(0)
     }
-    turn++
-    turn %= 2
   }
 }
 
-func startServer(port int, b *board.Board, ps [2]player.Player) {
-  s := server.New(b, ps)
+func startServer(port int, b *board.Board) {
+  players := [2]player.Player{
+    //http_player.New("ando", player.SENTE),
+    //http_player.New("yasushi", player.GOTE)}
+    console_player.New("ando", player.SENTE),
+    console_player.New("yasushi", player.GOTE)}
+  s := server.New(b, players)
   s.Start(port)
 }
 
@@ -55,16 +64,8 @@ func main() {
   }
 
   if *server {
-    players := [2]player.Player{
-      //http_player.New("ando", player.SENTE),
-      //http_player.New("yasushi", player.GOTE)}
-      console_player.New("ando", player.SENTE),
-      console_player.New("yasushi", player.GOTE)}
-    startServer(*port, b, players)
+    startServer(*port, b)
   } else {
-    players := [2]player.Player{
-      console_player.New("ando", player.SENTE),
-      console_player.New("yasushi", player.GOTE)}
-    startConsole(b, players)
+    startConsole(b)
   }
 }

Diff for: src/go/history.go

@@ -45,3 +45,7 @@ func (h *History)Pass(color cell.Cell) {
 func (h *History)Last() Record {
   return h.history.Last().(Record)
 }
+
+func (h *History)IsLastPass() bool {
+  return h.history.Last().(Record).x == -1
+}

Diff for: src/go/match.go

@@ -0,0 +1,66 @@
+package match
+
+import (
+  "fmt"
+  "container/vector"
+  "./cell"
+  "./board"
+  "./player"
+  "./history"
+)
+
+type Status int
+const (
+  PLAYING = 0
+  FINISH = 1
+)
+
+type Match struct {
+  turn int
+  board *board.Board
+  history *history.History
+  players [2]player.Player
+  agehama [2]int
+  Winner *player.Player
+}
+
+func New(b *board.Board, players [2]player.Player) *Match {
+  match := &Match{0, b, history.New(), players, [2]int{0, 0}, nil}
+  return match
+}
+
+func (m *Match)NextTurn() {
+  m.turn++
+  m.turn %= 2
+}
+
+func (m *Match)Next() (Status, player.Status) {
+  p := m.players[m.turn]
+  var color cell.Cell
+  if p.Teban() == player.SENTE { color = cell.BLACK } else { color = cell.WHITE }
+  resp := p.Next(m.board, m.history, m.agehama)
+  var status Status
+  switch resp.Status {
+    case player.PUT:
+      fmt.Printf("%v\n", resp.Data)
+      taken := resp.Data["taken"].(vector.Vector)
+      m.history.Add(color, resp.Data["x"].(int), resp.Data["y"].(int), taken)
+      m.agehama[m.turn] += len(taken)
+      status = PLAYING
+      m.NextTurn()
+    case player.PASS:
+      if m.history.IsLastPass() {
+        m.history.Pass(color)
+        // m.Winner = ?
+        status = FINISH
+      } else {
+        m.history.Pass(color)
+        status = PLAYING
+        m.NextTurn()
+      }
+    case player.GIVEUP:
+      m.Winner = &m.players[(m.turn+1)%2]
+      status = FINISH
+  }
+  return status, resp.Status
+}

Diff for: src/go/player.go

@@ -2,15 +2,23 @@ package player
 
 import (
   "./board"
+  "./history"
 )
 
 type Status int
 const (
   PUT Status = 0
   PASS Status = 1
   GIVEUP Status = 2
+  KO Status = 3
+  FORBIDDEN Status = 4
 )
 
+type Response struct {
+  Status Status
+  Data map[string] interface{}
+}
+
 type Teban int
 const (
   SENTE Teban = 0
@@ -21,5 +29,5 @@ const (
 type Player interface {
   Name() string
   Teban() Teban
-  Next(b *board.Board) Status
+  Next(b *board.Board, h *history.History, agehama [2]int) *Response
 }