strictness of board validation

lichess-org · Feb 20, 2013 · 5d7b1e1 · 5d7b1e1
1 parent 195b624
commit 5d7b1e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/main/scala/Board.scala b/src/main/scala/Board.scala
@@ -130,12 +130,10 @@ case class Board(
 
   def visual = Visual >> this
 
-  def valid = Color.all map rolesOf forall { roles ⇒ 
-    Seq(
-      (roles count (_ == King)) == 1,
-      (roles count (_ == Pawn)) <= 8,
-      roles.size <= 16
-    ) forall identity
+  def valid(strict: Boolean) = Color.all map rolesOf forall { roles ⇒
+    ((roles count (_ == King)) == 1) :: {
+      if (strict) List((roles count (_ == Pawn)) <= 8, roles.size <= 16) else Nil
+    } forall identity
   }
 
   override def toString = visual

diff --git a/src/main/scala/Situation.scala b/src/main/scala/Situation.scala
@@ -24,7 +24,7 @@ case class Situation(board: Board, color: Color) {
 
   def end: Boolean = checkMate || staleMate || autoDraw
 
-  def playable: Boolean = board.valid && !end
+  def playable(strict: Boolean): Boolean = (board valid strict) && !end
 
   def move(from: Pos, to: Pos, promotion: Option[PromotableRole]): Valid[Move] = for {
     actor ← board.actors get from toValid "No piece on " + from