Skip to content

allowed inverted player symbols in KI2 parsing #77

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 inverted player symbols in KI2 parsing #77

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/004.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 @@ -132,5 +132,6 @@ class JVMGameSpec extends FlatSpec with MustMatchers with GeneratorDrivenPropert
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
Game.parseKi2String(loadFile("ki2/game/004.ki2")).trunk.moves.length mustBe 27
}
}
2 changes: 1 addition & 1 deletion 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,7 +264,7 @@ 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.replaceAll("▲", " ▲").replaceAll("△", " △").split(" ").filter(_.nonEmpty).map((_, n))
case (x, n) if isNormalMoveKi2(x) => x.replaceAll("▲", " ▲").replaceAll("[△▽]", " △").split(" ").filter(_.nonEmpty).map((_, n))
case _ => Seq.empty
}

Expand Down