Commit: 25 - doubutu (svn)

どうぶつしょうぎの完全解析をするGUI

Commit MetaInfo

• Revision: 25 (tree)
• Time: 2015-07-22 13:19:41
• Author: bellyoshi

Log Message

Change Summary

• modified: doubutu.UI.Form/Move.vb
• modified: doubutu.UI.Form/Board.vb
• modified: doubutu.UI.Form/frmMain.Designer.vb
• modified: doubutu.UI.Form/frmMain.vb

Incremental Difference

--- doubutu.UI.Form/Move.vb	(revision 24)
+++ doubutu.UI.Form/Move.vb	(revision 25)
@@ -43,7 +43,7 @@
     ''' <remarks></remarks>
     Public Property ToPos As Position
     ''' <summary>
-    ''' 駒の種類
+    ''' 移動した駒の種類
     ''' </summary>
     ''' <value></value>
     ''' <returns></returns>
@@ -51,6 +51,14 @@
     Public Property Koma As Koma
 
     ''' <summary>
+    ''' 取った駒の種類
+    ''' </summary>
+    ''' <value></value>
+    ''' <returns></returns>
+    ''' <remarks></remarks>
+    Public Property CapturedPiece As Koma = Form.Koma.Empty
+
+    ''' <summary>
     ''' なりごまとなるか（ヒヨコがニワトリになるか）
     ''' </summary>
     ''' <returns></returns>
@@ -72,5 +80,10 @@
         Return False
     End Function
 
-
+    Public Shared Operator =(ByVal op1 As Move, ByVal op2 As Move)
+        Return op1.ToString = op2.ToString
+    End Operator
+    Public Shared Operator <>(ByVal op1 As Move, ByVal op2 As Move)
+        Return Not (op1 = op2)
+    End Operator
 End Class

--- doubutu.UI.Form/Board.vb	(revision 24)
+++ doubutu.UI.Form/Board.vb	(revision 25)
@@ -15,8 +15,24 @@
     ''' <remarks></remarks>
     Private _Capured(5) As Integer
 
-    Private _turn As Side
+    ''' <summary>
+    ''' 手番
+    ''' </summary>
+    ''' <remarks></remarks>
+    Private _side As Side
 
+    ''' <summary>
+    ''' 手数
+    ''' </summary>
+    ''' <remarks></remarks>
+    Private _turnCount As Integer
+
+    ''' <summary>
+    ''' 棋譜ログ
+    ''' </summary>
+    ''' <remarks></remarks>
+    Private _logs As New List(Of Move)
+
     Public Function GetCells(ByVal pos As Position) As Koma
         Return GetCells(pos.X, pos.Y)
     End Function
@@ -61,7 +77,8 @@
         For Each c As Integer In _Capured
             c = 0
         Next
-        Me._turn = Side.sente
+        Me._side = Side.sente
+        Me._turnCount = 0
     End Sub
 
     ''' <summary>
@@ -78,7 +95,11 @@
         For i As Integer = 0 To Me._Capured.Count - 1
             Me._Capured(i) = source._Capured(i)
         Next
-        Me._turn = source._turn
+        Me._side = source._side
+        Me._turnCount = source._turnCount
+        For Each log As Move In source._logs
+            _logs.Add(log)
+        Next
     End Sub
 
     ''' <summary>
@@ -101,7 +122,7 @@
             s.Append(_Capured(i))
         Next
         s.AppendLine()
-        s.AppendLine(SideUtil.ToCode(_turn))
+        s.AppendLine(SideUtil.ToCode(_side))
         Return s.ToString
     End Function
 
@@ -145,9 +166,61 @@
     Public Sub DoMove(ByVal move As Move)
         Debug.Assert(CanMove(move))
         DoEdit(move)
-        _turn = DirectCast(-_turn, Side)
+        AddLog(move)
+        _side = DirectCast(-_side, Side)
     End Sub
 
+    ''' <summary>
+    ''' 一手進める
+    ''' </summary>
+    ''' <remarks></remarks>
+    Public Sub DoNext()
+        If _turnCount >= _logs.Count Then
+            Exit Sub
+        End If
+        Dim move As Move = _logs(_turnCount)
+        DoMove(move)
+    End Sub
+
+    Private Sub AddLog(ByVal move As Move)
+        If _logs.Count = _turnCount Then
+            _logs.Add(move)
+        ElseIf _logs.Count > _turnCount Then
+            If _logs(_turnCount) <> move Then
+                _logs(_turnCount) = move
+            End If
+            For i As Integer = _logs.Count - 1 To _turnCount + 1
+                _logs.RemoveAt(i)
+            Next
+        End If
+        _turnCount += 1
+        Debug.Assert(_turnCount <= _logs.Count)
+    End Sub
+
+    ''' <summary>
+    ''' 一手戻す。
+    ''' </summary>
+    ''' <remarks></remarks>
+    Public Sub Undo()
+        If _turnCount <= 0 Then
+            Exit Sub
+        End If
+        _turnCount -= 1
+        Dim move As Move = _logs(_turnCount)
+        If move.FromPos.IsCaptured Then
+            _Capured(CapuredKomaIndex(move.Koma)) += 1
+            SetCells(move.ToPos, Koma.Empty)
+        Else
+            If move.CapturedPiece <> Koma.Empty Then
+                Dim capturedPiece As Koma = KomaUtil.CaputringKoma(move.CapturedPiece)
+                _Capured(CapuredKomaIndex(capturedPiece)) -= 1
+            End If
+            SetCells(move.ToPos, move.CapturedPiece)
+            SetCells(move.FromPos, move.Koma)
+        End If
+        _side = -_side
+    End Sub
+
     Public Sub DoEdit(ByVal move As Move)
         If move.FromPos.IsCaptured Then
             _Capured(CapuredKomaIndex(move.Koma)) -= 1
@@ -158,6 +231,7 @@
                 If capturedPiece <> Koma.GoteLI AndAlso
                    capturedPiece <> Koma.SenteLI Then
                     _Capured(CapuredKomaIndex(capturedPiece)) += 1
+                    move.CapturedPiece = GetCells(move.ToPos)
                 End If
             End If
             SetCells(move.ToPos, GetCells(move.FromPos))
@@ -172,7 +246,7 @@
     ''' <returns></returns>
     ''' <remarks></remarks>
     Public Function CanMove(ByVal move As Move) As Boolean
-        If Not _turn = KomaUtil.KomaSide(move.Koma) Then
+        If Not _side = KomaUtil.KomaSide(move.Koma) Then
             Return False
         End If
         Dim fromPos As Position = move.FromPos

--- doubutu.UI.Form/frmMain.Designer.vb	(revision 24)
+++ doubutu.UI.Form/frmMain.Designer.vb	(revision 25)
@@ -25,7 +25,10 @@
         Dim Board1 As doubutu.UI.Form.Board = New doubutu.UI.Form.Board()
         Me.btnAnalyze = New System.Windows.Forms.Button()
         Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.btnUndoFirst = New System.Windows.Forms.Button()
+        Me.btnUndo = New System.Windows.Forms.Button()
         Me.BoardViewer1 = New doubutu.UI.Form.Control.Board.BoardViewer()
+        Me.btnNext = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
         'btnAnalyze
@@ -46,20 +49,50 @@
         Me.TextBox1.Size = New System.Drawing.Size(392, 318)
         Me.TextBox1.TabIndex = 2
         '
+        'btnUndoFirst
+        '
+        Me.btnUndoFirst.Location = New System.Drawing.Point(86, 35)
+        Me.btnUndoFirst.Name = "btnUndoFirst"
+        Me.btnUndoFirst.Size = New System.Drawing.Size(89, 23)
+        Me.btnUndoFirst.TabIndex = 4
+        Me.btnUndoFirst.Text = "初手に戻す"
+        Me.btnUndoFirst.UseVisualStyleBackColor = True
+        '
+        'btnUndo
+        '
+        Me.btnUndo.Location = New System.Drawing.Point(181, 35)
+        Me.btnUndo.Name = "btnUndo"
+        Me.btnUndo.Size = New System.Drawing.Size(75, 23)
+        Me.btnUndo.TabIndex = 4
+        Me.btnUndo.Text = "一手戻す"
+        Me.btnUndo.UseVisualStyleBackColor = True
+        '
         'BoardViewer1
         '
         Me.BoardViewer1.IsBoardViewRotated = False
         Me.BoardViewer1.kyokumen = Board1
-        Me.BoardViewer1.Location = New System.Drawing.Point(12, 12)
+        Me.BoardViewer1.Location = New System.Drawing.Point(12, 92)
         Me.BoardViewer1.Name = "BoardViewer1"
         Me.BoardViewer1.Size = New System.Drawing.Size(774, 544)
         Me.BoardViewer1.TabIndex = 3
         '
+        'btnNext
+        '
+        Me.btnNext.Location = New System.Drawing.Point(262, 35)
+        Me.btnNext.Name = "btnNext"
+        Me.btnNext.Size = New System.Drawing.Size(75, 23)
+        Me.btnNext.TabIndex = 5
+        Me.btnNext.Text = "一手進める"
+        Me.btnNext.UseVisualStyleBackColor = True
+        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 15.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1272, 554)
+        Me.ClientSize = New System.Drawing.Size(1272, 672)
+        Me.Controls.Add(Me.btnNext)
+        Me.Controls.Add(Me.btnUndo)
+        Me.Controls.Add(Me.btnUndoFirst)
         Me.Controls.Add(Me.BoardViewer1)
         Me.Controls.Add(Me.TextBox1)
         Me.Controls.Add(Me.btnAnalyze)
@@ -72,5 +105,8 @@
     Friend WithEvents btnAnalyze As System.Windows.Forms.Button
     Friend WithEvents TextBox1 As System.Windows.Forms.TextBox
     Friend WithEvents BoardViewer1 As doubutu.UI.Form.Control.Board.BoardViewer
+    Friend WithEvents btnUndoFirst As System.Windows.Forms.Button
+    Friend WithEvents btnUndo As System.Windows.Forms.Button
+    Friend WithEvents btnNext As System.Windows.Forms.Button
 
 End Class

--- doubutu.UI.Form/frmMain.vb	(revision 24)
+++ doubutu.UI.Form/frmMain.vb	(revision 25)
@@ -34,4 +34,19 @@
             e.Cancel = True
         End If
     End Sub
+
+    Private Sub btnUndoFirst_Click(sender As System.Object, e As System.EventArgs) Handles btnUndoFirst.Click
+        BoardViewer1.kyokumen = New Board()
+        BoardViewer1.DrawCurrentBitmap()
+    End Sub
+
+    Private Sub btnUndo_Click(sender As System.Object, e As System.EventArgs) Handles btnUndo.Click
+        BoardViewer1.kyokumen.Undo()
+        BoardViewer1.DrawCurrentBitmap()
+    End Sub
+
+    Private Sub btnNext_Click(sender As System.Object, e As System.EventArgs) Handles btnNext.Click
+        BoardViewer1.kyokumen.DoNext()
+        BoardViewer1.DrawCurrentBitmap()
+    End Sub
 End Class