Projects >> seage >>17dedb90cd809f6cd7e009b0fdef3f2f90101d8b

Chunk
Conflicting content 
            int i=0;
            while (i++ < _iterationsToGo && _keepSearching)
            {
<<<<<<< HEAD
//                System.out.println("---------------------------\n"+i+"-th ITERATION");
=======
                log.finer("---------------------------\n"+i+"-th ITERATION");
>>>>>>> 37ce33147250fe68a1f4e14bdeb0a62b2efb3d03
                _currentIteration++;

                evaluatePopulation(_population);
Solution content 
            int i=0;
            while (i++ < _iterationsToGo && _keepSearching)
            {
<<<<<<< .mine//                System.out.println("---------------------------\n"+i+"-th ITERATION");
=======                log.finer("---------------------------\n"+i+"-th ITERATION");
>>>>>>> .theirs                _currentIteration++;

                evaluatePopulation(_population);
File
FireflySearch.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
                        d=d+_operator.getDistance(_population.getSolutions()[s1],_population.getSolutions()[s2]);
                    }
                }
<<<<<<< HEAD
//                System.out.println("average distance = "+(double)d/(_population.getSize()*(_population.getSize()+1)/2));
=======
                log.finer("average distance = "+(double)d/(_population.getSize()*(_population.getSize()+1)/2));
>>>>>>> 37ce33147250fe68a1f4e14bdeb0a62b2efb3d03
                //_population.removeTwins();

//                for(int j=0;j<_population.getSize();j++){
Solution content 
                        d=d+_operator.getDistance(_population.getSolutions()[s1],_population.getSolutions()[s2]);
                    }
                }
<<<<<<< .mine//                System.out.println("average distance = "+(double)d/(_population.getSize()*(_population.getSize()+1)/2));
=======                log.finer("average distance = "+(double)d/(_population.getSize()*(_population.getSize()+1)/2));
>>>>>>> .theirs                //_population.removeTwins();

//                for(int j=0;j<_population.getSize();j++){
File
FireflySearch.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
                    // check a worse solution than previous
                currBestFitness = _objectiveFunction.evaluate(_population.getBestSolution())[0];//.getObjectiveValue()[0];
<<<<<<< HEAD
//                System.out.println(currBestFitness);
=======
                //System.out.println(currBestFitness);
>>>>>>> 37ce33147250fe68a1f4e14bdeb0a62b2efb3d03
		if(currBestFitness != _population.getBestSolution().getObjectiveValue()[0])     // SOLVED
                    throw new Exception("Fitness function failed");
                //prevFitness = currFitness;
Solution content 
                    // check a worse solution than previous
                currBestFitness = _objectiveFunction.evaluate(_population.getBestSolution())[0];//.getObjectiveValue()[0];
                //System.out.println(currBestFitness);
		if(currBestFitness != _population.getBestSolution().getObjectiveValue()[0])     // SOLVED
                    throw new Exception("Fitness function failed");
                //prevFitness = currFitness;
File
FireflySearch.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
            }

            evaluatePopulation(_population);
<<<<<<< HEAD
            System.out.println(_population.getBestSolution().toString());
            System.out.println(_bestSolution.toString());
=======
            log.finer(_population.getBestSolution().toString());
>>>>>>> 37ce33147250fe68a1f4e14bdeb0a62b2efb3d03
            fireFireflySearchStopped();
        }
        catch (Exception ex)
Solution content 
            }

            evaluatePopulation(_population);
            log.finer(_population.getBestSolution().toString());
            System.out.println(_bestSolution.toString());
            fireFireflySearchStopped();
        }
        catch (Exception ex)
File
FireflySearch.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
 */
public class QapFireflyAlgorithmTest implements FireflySearchListener
{
<<<<<<< HEAD
    
    private static String _dataPath = "data/esc128.dat";
=======
    private static final Logger log = Logger.getLogger("org.seage");
    private static String _dataPath = "data/tai12a.dat";
>>>>>>> 37ce33147250fe68a1f4e14bdeb0a62b2efb3d03
//    private static String _dataPath = "D:\\qap\\bur26a.dat";
    public FireflySearch fs;
    public static int iters = 2;
Solution content 
 */
public class QapFireflyAlgorithmTest implements FireflySearchListener
{
    private static final Logger log = Logger.getLogger("org.seage");
    private static String _dataPath = "data/esc128.dat";
//    private static String _dataPath = "D:\\qap\\bur26a.dat";
    public FireflySearch fs;
    public static int iters = 2;
File
QapFireflyAlgorithmTest.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        {
<<<<<<< HEAD
            double sum=0;
            String str = "";
            for(int i=0;i>>>>>> 37ce33147250fe68a1f4e14bdeb0a62b2efb3d03
        }
        catch(Exception ex)
        {
Solution content 
    {
        try
        {
            double sum=0;
            String str = "";
            for(int i=0;i
File
QapFireflyAlgorithmTest.java
Developer's decision
Version 1
Kind of conflict
For statement
Method invocation
Variable