Skip to content

Commit

Permalink
Improve project structure
Browse files Browse the repository at this point in the history
  • Loading branch information
zbyju committed Oct 8, 2024
1 parent a081582 commit 0653718
Show file tree
Hide file tree
Showing 24 changed files with 28 additions and 104 deletions.
4 changes: 2 additions & 2 deletions src/main/scala/Main.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import model.Board
import model.Coords
import model.board.Board
import model.board.Coords
import model.PieceType
import model.Color

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package model
package model.board

import model.board.BitPosition

final case class BitArray(private val bits: Long = 0L) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
package model

import model.pieces.CharPiece
package model.board

final case class BitBoard private (board: BitArray) extends BitBoardLike {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package model
package model.board

trait BitBoardLike {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package model
package model.board

import scala.math.ScalaNumericConversions

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package model
package model.board

import model.pieces.Tile
import scala.Nothing
import java.security.InvalidParameterException
import model.pieces.CharPiece
import scala.annotation.switch
import model.Color
import model.PieceType

/** The `Board` class represents a chess board in the context of a chess game.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package model
package model.board

import model.PieceType

case class BoardOfColor(
pawns: BitBoard,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package model
package model.board

case class Coords private (rank: Byte, file: Byte) {
require(rank >= 0 && rank <= 7 && file >= 0 && file <= 7)
Expand Down
5 changes: 0 additions & 5 deletions src/main/scala/model/pieces/Bishop.scala

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/scala/model/pieces/CharPiece.scala

This file was deleted.

8 changes: 0 additions & 8 deletions src/main/scala/model/pieces/Empty.scala

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/scala/model/pieces/King.scala

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/scala/model/pieces/Knight.scala

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/scala/model/pieces/Pawn.scala

This file was deleted.

12 changes: 0 additions & 12 deletions src/main/scala/model/pieces/Piece.scala

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/scala/model/pieces/Queen.scala

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/scala/model/pieces/Rook.scala

This file was deleted.

22 changes: 0 additions & 22 deletions src/main/scala/model/pieces/Tile.scala

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package model
package model.board

import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import model.misc.BitArray

def binaryStringToLong(binary: String): Option[Long] = {
if (binary.length == 64 && binary.forall(c => c == '0' || c == '1')) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import model.{BitBoard, BitArray, Coords, BitPosition}
import model.board.BitBoard
import model.board.Coords
import model.board.BitPosition

class BitBoardTest extends AnyFlatSpec with Matchers {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import model.Coords
import model.BitPosition
import model.board.BitPosition
import model.board.Coords

class BitPositionTest extends AnyFlatSpec with Matchers {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package model
package model.board

import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import model.PieceType

class BoardOfColorTest extends AnyFlatSpec with Matchers {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package model
package model.board

import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import model.PieceType
import model.Color

class BoardTest extends AnyFlatSpec with Matchers {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import model.Coords
import model.board.Coords

class CoordsTest extends AnyFlatSpec with Matchers {

Expand Down

0 comments on commit 0653718

Please sign in to comment.