Merge pull request #61 from tyrcho/master

util classes for gomoku/tic-tac-toe, upgraded to latest sbt version
note: LGTM, no big changes though.

Author: Wei-1

build.sbt

@@ -2,10 +2,19 @@ name := "CodinGame-Scala-Kit"
 version := "0.1.0"
 scalaVersion := "2.12.4"
 
+// solve a weird issue with java dependencies (trait Approving)
+// see https://stackoverflow.com/questions/43751394/package-cats-contains-object-and-package-with-same-name-implicits &
+// https://github.com/druid-io/tranquility/blob/master/build.sbt
+scalacOptions := Seq("-Yresolve-term-conflict:object")
+
+
+resolvers += Resolver.mavenLocal
+
 libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"
+libraryDependencies += "com.github.writethemfirst" % "approvals-java" % "0.4" % "test"
 libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.12.4" % "test"
 libraryDependencies += "com.geirsson" %% "scalafmt-core" % "1.3.0"
 libraryDependencies += "com.geirsson" %% "scalafmt-cli" % "1.3.0"
 
 enablePlugins(JmhPlugin)
-enablePlugins(JavaAppPackaging)
+enablePlugins(JavaAppPackaging)

project/build.properties

@@ -1 +1 @@
-sbt.version = 0.13.15
+sbt.version = 1.1.1

project/plugins.sbt

@@ -1,4 +1,4 @@
 logLevel := Level.Warn
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.25")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.0")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.3")
 

src/main/scala/com/truelaurel/math/geometry/Pos.scala

@@ -11,6 +11,10 @@ case class Pos(x: Int, y: Int) {
 
   def +(pos: Pos): Pos = Pos(x + pos.x, y + pos.y)
 
+  def /(r: Int): Pos = Pos(x / r, y / r)
+
+  def %(r: Int): Pos = Pos(x % r, y % r)
+
   def neighborIn(direction: Direction): Pos = direction match {
     case N => Pos(x, y - 1)
     case S => Pos(x, y + 1)

src/main/scala/com/truelaurel/math/geometry/grid/Masks.scala

@@ -2,14 +2,16 @@ package com.truelaurel.math.geometry.grid
 
 case class Masks(size: Int, needed: Int) {
   val empty = GridData(size)
-  val matrixIndices = for {
+
+  val matrixIndices: Seq[(Int, Int)] = for {
     r0 <- 0 to size - needed
     c0 <- 0 to size - needed
   } yield (r0, c0)
+    
   val matricesCompleted: Set[Long] =
     (preComputedMatricesRows ++ preComputedMatricesCols :+ preComputedMatricesDiag1 :+ preComputedMatricesDiag2).toSet
 
-  def isComplete(grid: GridData) =
+  def isComplete(grid: GridData): Boolean =
     matrixIndices.exists {
       case (r0, c0) =>
         val gsm = grid.subMatrix(r0, c0, needed)
@@ -20,30 +22,30 @@ case class Masks(size: Int, needed: Int) {
     (0 until needed).map(row => (for {
       c <- 0 until needed
       i = row * needed + c
-      bit = (1L << i)
+      bit = 1L << i
     } yield bit).sum)
 
   def preComputedMatricesCols: Seq[Long] =
     (0 until needed).map(col => (for {
       r <- 0 until needed
       i = r * needed + col
-      bit = (1L << i)
+      bit = 1L << i
     } yield bit).sum)
 
   def preComputedMatricesDiag1: Long =
     (for {
       r <- 0 until needed
       c = r
       i = r * needed + c
-      bit = (1L << i)
+      bit = 1L << i
     } yield bit).sum
 
   def preComputedMatricesDiag2: Long =
     (for {
       r <- 0 until needed
       c = needed - 1 - r
       i = r * needed + c
-      bit = (1L << i)
+      bit = 1L << i
     } yield bit).sum
 
 }

src/main/scala/com/truelaurel/samplegames/gomoku/GomokuBoard.scala

@@ -34,16 +34,20 @@ case class GomokuBoard(
   def play(x: Int, y: Int): GomokuBoard = play(Pos(x, y))
 
   def play(p: Pos): GomokuBoard =
-    if (nextPlayer)
+    forcePlay(p, nextPlayer)
+
+  def forcePlay(p: Pos, player: Boolean): GomokuBoard = {
+    if (player)
       copy(
-        nextPlayer = false,
+        nextPlayer = !player,
         dataFree = dataFree - (p.x, p.y),
         dataTrue = dataTrue + (p.x, p.y))
     else
       copy(
-        nextPlayer = true,
+        nextPlayer = !player,
         dataFree = dataFree - (p.x, p.y),
         dataFalse = dataFalse + (p.x, p.y))
+  }
 
   def remove(p: Pos): GomokuBoard =
     copy(