Projects >> VRP_ILS >>efcb77c2d855e7dd9103bac1665130264a176a87

Chunk
Conflicting content 
    private String routes;

    public ILSSolutionSet(int bestDistance, int bestIteration, double bestTime,
<<<<<<< HEAD
            double totalTime, int numRoutes, int numberOfIt, String routes) {
        //TODO arreglar esto
=======
           double totalTime, int numRoutes, int numberOfIt, String routes, int totalDistance) {

>>>>>>> 833d3e8a877b7f908b88db94f06b9d8e107337f7
        super(totalTime);
        this.bestDistance = bestDistance;
        this.bestIteration = bestIteration;
Solution content 
    private String routes;

    public ILSSolutionSet(int bestDistance, int bestIteration, double bestTime,
           double totalTime, int numRoutes, int numberOfIt, String routes, int totalDistance) {

        super(totalTime);
        this.bestDistance = bestDistance;
        this.bestIteration = bestIteration;
File
ILSSolutionSet.java
Developer's decision
Version 2
Kind of conflict
Comment
Variable
Chunk
Conflicting content 
    public void setRoutes(String routes) {
        this.routes = routes;
    }
<<<<<<< HEAD
=======

    public int getTotaldistance() {
        return totaldistance;
    }

    public void setTotaldistance(int totaldistance) {
        this.totaldistance = totaldistance;
    }

    
>>>>>>> 833d3e8a877b7f908b88db94f06b9d8e107337f7
}
Solution content 
    public void setRoutes(String routes) {
        this.routes = routes;
    }

    public int getTotaldistance() {
        return totaldistance;
    }

    public void setTotaldistance(int totaldistance) {
        this.totaldistance = totaldistance;
    }

    
}
File
ILSSolutionSet.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD
    public SolutionSet execute() {
        int iteration = 0;
        int bestIteration = 0;
=======
    public ILSSolutionSet execute() {
        int iteration=0;
        int bestIteration=0;
>>>>>>> 833d3e8a877b7f908b88db94f06b9d8e107337f7
        long tIni = System.nanoTime();
        int i = 0;
        //TODO Aca va el algoritmo que Simon no quiere hacer
Solution content 
    }

    @Override
    public ILSSolutionSet execute() {
        int iteration=0;
        int bestIteration=0;
        long tIni = System.nanoTime();
        int i = 0;
        //TODO Aca va el algoritmo que Simon no quiere hacer
File
IteratedLocalSearchAlgorithm.java
Developer's decision
Version 2
Kind of conflict
Method signature
Variable
Chunk
Conflicting content 
        double tBest = (tFinBest - tIni) / mili;
        double tTotal = (tFin - tIni) / mili;
        String finalRoutes = routesToString();
<<<<<<< HEAD
        return (new ILSSolutionSet(1, bestIteration, tBest, tTotal, routes.size(),
                iteration, finalRoutes));
=======
        return (new ILSSolutionSet(totalCost, bestIteration,tBest,tTotal,routes.size(), 
                iteration, finalRoutes, totalDistance));
>>>>>>> 833d3e8a877b7f908b88db94f06b9d8e107337f7
    }

    private List> cloneRoutes(List> orig) {
Solution content 
        double tBest = (tFinBest - tIni) / mili;
        double tTotal = (tFin - tIni) / mili;
        String finalRoutes = routesToString();
        return (new ILSSolutionSet(1, bestIteration, tBest, tTotal, routes.size(),
                iteration, finalRoutes));
    }

    private List> cloneRoutes(List> orig) {
File
IteratedLocalSearchAlgorithm.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
    }

    private String routesToString() {
<<<<<<< HEAD
        String s = "";
        for (List route : bestRoutes) {
            s = s + "0 ";
=======
        String s= "\n\n";
        for (List route : routes) {
            s = s+ "0 ";
>>>>>>> 833d3e8a877b7f908b88db94f06b9d8e107337f7
            for (Integer element : route) {
                s = s + element + " ";
            }
Solution content 
    }

    private String routesToString() {
        String s = "";
        for (List route : bestRoutes) {
            s = s + "0 ";
            for (Integer element : route) {
                s = s + element + " ";
            }
File
IteratedLocalSearchAlgorithm.java
Developer's decision
Version 1
Kind of conflict
For statement
Variable