package pw.scho.battleship.model;

import java.util.Random;

public class BoardRandomizer {

    private final Random random = new Random();
    private Board board;

    public Board randomizeWithStandardShips() {
        return randomize(new int[]{2, 2, 3, 3, 4, 5});
    }

    public Board randomize(int[] shipSizes) {
        board = new Board();

        for (int size : shipSizes) {
            placeShip(size);
        }

        return board;
    }

    private void placeShip(int size) {
        while (true) {
            Ship ship = createRandomShip(size);

            if (board.shipIsPlaceable(ship)) {
                board.placeShip(ship);
                break;
            }
        }
    }

    private Ship createRandomShip(int size) {
        int x = random.nextInt(Board.WIDTH - 1);
        int y = random.nextInt(Board.HEIGHT - 1);

        Position position = new Position(x, y);

        if (random.nextBoolean()) {
            return Ship.createHorizontal(position, size);
        } else {
            return Ship.createVertical(position, size);
        }
    }
}

package pw.scho.battleship.model;

import java.util.Random;

public class BoardRandomizer {

    private final Random random = new Random();
    private Board board;

    public Board randomizeWithStandardShips() {
        return randomize(new int[]{2, 2, 2, 2, 3, 3, 3, 4, 4, 5});
    }

    public Board randomize(int[] shipSizes) {
        board = new Board();

        for (int size : shipSizes) {
            placeShip(size);
        }

        return board;
    }

    private void placeShip(int size) {
        while (true) {
            Ship ship = createRandomShip(size);

            if (board.shipIsPlaceable(ship)) {
                board.placeShip(ship);
                break;
            }
        }
    }

    private Ship createRandomShip(int size) {
        int x = random.nextInt(Board.WIDTH - 1);
        int y = random.nextInt(Board.HEIGHT - 1);

        Position position = new Position(x, y);

        if (random.nextBoolean()) {
            return Ship.createHorizontal(position, size);
        } else {
            return Ship.createVertical(position, size);
        }
    }
}

--- 
+++ 
@@ -8,7 +8,7 @@
     private Board board;
 
     public Board randomizeWithStandardShips() {
-        return randomize(new int[]{2, 2, 2, 2, 3, 3, 3, 4, 4, 5});
+        return randomize(new int[]{2, 2, 3, 3, 4, 5});
     }
 
     public Board randomize(int[] shipSizes) {
Reduce number of placed ships
