Skip to content

allowed ambiguity in Ki2 Format #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mogproject merged 1 commit into from
Jun 24, 2017
Merged

allowed ambiguity in Ki2 Format #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jvm/src/test/resources/ki2/game/003.ki2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
▲７六歩△８四歩▲５六歩△３四歩▲５五歩△６二銀▲５八飛△５二金右▲４八玉△４二玉▲３八玉△３二玉▲６八銀△５四歩▲５七銀△５五歩▲４六銀△８五歩▲７七角△４二銀▲５五銀△５三銀右▲５四歩△４四銀▲同銀△同歩▲５三銀△４三金▲４二銀成△同金直▲５三銀△５二歩▲４二銀成△同玉
1 change: 1 addition & 0 deletions jvm/src/test/scala/com/mogproject/mogami/core/JVMGameSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,6 @@ class JVMGameSpec extends FlatSpec with MustMatchers with GeneratorDrivenPropert
"Game#parseKi2String" must "create games from files" in StateCache.withCache { implicit cache =>
Game.parseKi2String(loadFile("ki2/game/001.ki2")).trunk.moves.length mustBe 111
Game.parseKi2String(loadFile("ki2/game/002.ki2")).trunk.moves.length mustBe 111
Game.parseKi2String(loadFile("ki2/game/003.ki2")).trunk.moves.length mustBe 34
}
}
6 changes: 3 additions & 3 deletions shared/src/main/scala/com/mogproject/mogami/core/io/kif/KifGameIO.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,16 +264,16 @@ trait KifGameReader extends KifBranchReader with KifGameIO with KifGameFactory[G
}

protected[io] def splitMovesKi2(lines: Lines): Lines = lines.flatMap {
case (x, n) if isNormalMoveKi2(x) => x.split(" ").filter(_.nonEmpty).map((_, n))
case (x, n) if isNormalMoveKi2(x) => x.replaceAll("▲", " ▲").replaceAll("△", " △").split(" ").filter(_.nonEmpty).map((_, n))
case _ => Seq.empty
}

private[this] def sectionSplitterCommon(nel: NonEmptyLines, isHeader: String => Boolean): (Lines, NonEmptyLines, Lines) = {
val (header, body) = nel.lines.span { case (x, _) => isHeader(x) }
val (st, gi) = header.partition(ln => isInitialState(ln._1))

if (st.isEmpty) throw new RecordFormatException(header.lastOption.map(_._2).getOrElse(0), "initial state must be defined")
(gi, NonEmptyLines(st), body)
/** @note allows no initial state line (complement with HIRATE) */
(gi, NonEmptyLines(st.isEmpty.fold(Seq(("手合割：平手", 0)), st)), body)
}

private[this] def sectionSplitterKif(nel: NonEmptyLines): (Lines, NonEmptyLines, Lines, Option[Line]) = {
Expand Down
7 changes: 6 additions & 1 deletion shared/src/main/scala/com/mogproject/mogami/core/move/MoveBuilderKi2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,15 @@ case class MoveBuilderKi2(player: Player,
case Some(Dropped) => Some(None)
case Some(mvmt) =>
state.attackBBOnBoard(player).find { case (sq, bb) =>
state.board(sq).ptype == oldPtype && bb.get(moveTo) && getMovement(state, Some(sq), moveTo, oldPtype).contains(mvmt)
state.board(sq).ptype == oldPtype && bb.get(moveTo) && getMovement(state, Some(sq), moveTo, oldPtype).exists(compareMovement(_, mvmt))
}.map { case (sq, _) => Some(sq) }
}

private[this] def compareMovement(a: Movement, b: Movement): Boolean = {
/** @note allows ambiguity between Upward and Vertical */
a == b || a == Movement.Upward && b == Movement.Vertical
}

override def toMove(state: State, lastMoveTo: Option[Square] = None, isStrict: Boolean): Option[Move] = for {
moveTo <- to match {
case Some(t) => Some(t)
Expand Down