Skip to content

Develop #45

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 2 commits into from
Apr 23, 2017
Merged

Develop #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ea3e96
implemented Game#getState and Branch#getState
mogproject Apr 23, 2017
dbb0efd
Merge branch 'master' into develop
mogproject Apr 23, 2017
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
2 changes: 2 additions & 0 deletions shared/src/main/scala/com/mogproject/mogami/core/game/Branch.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ case class Branch(initialHash: StateHash,

def clearComment(pos: Int): Branch = updateComments(comments - pos)

def getState(pos: Int): Option[State] = history.isDefinedAt(pos - offset).option(stateCache.get(history(pos - offset))).flatten

/**
* history of state hashes
*/
Expand Down
2 changes: 2 additions & 0 deletions shared/src/main/scala/com/mogproject/mogami/core/game/Game.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ case class Game(trunk: Branch = Branch(),
getBranch(branchNo).map { br => trunk.moves.take(br.offset - trunk.offset) ++ br.moves }.getOrElse(Vector.empty)
}

def getState(gamePosition: GamePosition): Option[State] = withBranch(gamePosition.branch)(_.getState(gamePosition.position)).flatten

def hasComment(gamePosition: GamePosition): Boolean = if (gamePosition.isTrunk) {
trunk.hasComment(gamePosition.position)
} else {
Expand Down
7 changes: 6 additions & 1 deletion shared/src/test/scala/com/mogproject/mogami/core/game/GameSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,6 @@ class GameSpec extends FlatSpec with MustMatchers with GeneratorDrivenPropertyCh
Game().truncated(GamePosition(0, 1)) mustBe Game()
Game().truncated(GamePosition(1, 0)) mustBe Game()


val s1 = SfenExtendedGame(
SfenExtendedBranch(
"lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL b - 0 2g2f 5a4b 2f2e",
Expand Down Expand Up @@ -813,4 +812,10 @@ class GameSpec extends FlatSpec with MustMatchers with GeneratorDrivenPropertyCh
g1.truncated(GamePosition(0, 1)).branches.length mustBe 1
g1.truncated(GamePosition(0, 0)).branches.length mustBe 1
}

"Game#getState" must "return state" in {
Game().getState(GamePosition(0, 0)) mustBe Some(HIRATE)
Game().getState(GamePosition(0, 1)) mustBe None
Game().getState(GamePosition(1, 0)) mustBe None
}
}