Commit 47005211 authored by Ciliste's avatar Ciliste
Browse files

Merge branch 'changement-archi' of https://github.com/Ciliste/JeuAssemblage into changement-archi

parents ed57f5cf 997d21de

jeuAssemblage/src/bot/strategy/AbstractStrategyAI.java

+54 −3
Changes for jeuAssemblage/src/bot/strategy/AbstractStrategyAI.java: 54 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ import java.util.Map; 
import java.util.Random;

import java.util.Collections;



import java.awt.Point;





import bot.interfaces.IStrategyBot;

import bot.Move;
@@ -56,11 +58,24 @@ public class AbstractStrategyAI implements IStrategyBot { 
    private List<PlayBoard> mutation(List<PlayBoard> toMutate, Random rand, double mutationRate) {



        List<PlayBoard> postMutation = new ArrayList<PlayBoard>();



        for (PlayBoard parent : toMutate) {



            postMutation.add(parent);



            if (rand.nextDouble(1) < mutationRate) {

                postMutation.add(individualMutation(parent, rand));

            double nextRand = rand.nextDouble(1);

            if ( nextRand < mutationRate) {



                if (nextRand < mutationRate / 3) {

                    postMutation.add(individualMutationSwapping(parent, rand));

                }

                else if ( nextRand < (2 * mutationRate) / 3) {

                    postMutation.add(individualMutationRotation(parent, rand));

                }

                else { 

                    postMutation.add(individualMutationSwapping(parent, rand));

                }



            }

        }
@@ -71,7 +86,7 @@ public class AbstractStrategyAI implements IStrategyBot { 
        return postMutation;

    }

    

    private PlayBoard individualMutation(PlayBoard parent1, Random rand) {

    private PlayBoard individualMutationSwapping(PlayBoard parent1, Random rand) {



        PlayBoard son = PlayBoard.constructCopyPlayBoard(parent1);
@@ -89,6 +104,42 @@ public class AbstractStrategyAI implements IStrategyBot { 
        return son;

    }

    

    private PlayBoard individualMutationRotation(PlayBoard parent1, Random rand) {

        

        double mutationRate = 0.33;



        PlayBoard son = PlayBoard.constructCopyPlayBoard(parent1);

        

        Map<Integer, Piece> piecesParent1 = parent1.getPieces();



        for (int cpt = 1; cpt < piecesParent1.size() + 1; cpt++) {



            if (rand.nextDouble(1) <= mutationRate) {



                Piece pieceClone = Piece.clone(son.getPieceById(cpt));



                final int MAX_ROTATIONS = 4;

                int nbRotations = rand.nextInt(MAX_ROTATIONS);

                for (int i = 0; i < nbRotations; i++) {



                    pieceClone.rotateLeft();

                }



                final int MAX_FLIPS = 2;

                int nbReverse = rand.nextInt(MAX_FLIPS);

                for (int i = 0; i < nbReverse; i++) {



                    pieceClone.reverse();

                }



                Point p = son.getUpperLeftPieceCornerById(cpt);

                son.placePieceAsId(p.x, p.y, pieceClone, cpt);

            }

        }



        return son;

    }

    

    @Override

    public Move nextMove() {

        return this.moves.remove(0);