Merge branch 'fix-refactorcopy' into 'master'

Define copy constructor that initialises all attributes of RefactorSequence...

See merge request se2/litterbox!458

src/main/java/de/uni_passau/fim/se2/litterbox/refactor/metaheuristics/chromosomes/RefactorSequence.java

@@ -25,7 +25,6 @@
 import de.uni_passau.fim.se2.litterbox.refactor.refactorings.Refactoring;
 import de.uni_passau.fim.se2.litterbox.utils.PropertyLoader;
 
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
@@ -108,6 +107,18 @@ public RefactorSequence(Program originalProgram, Mutation<RefactorSequence> muta
         this.refactoringFinders = refactoringFinders;
     }
 
+    /**
+     * Copy constructor
+     *
+     * @param other RefactoringSequence to copy
+     */
+    RefactorSequence(RefactorSequence other) {
+        super(other);
+        this.originalProgram = other.originalProgram;
+        this.productions = new LinkedList<>(other.productions);
+        this.refactoringFinders = other.refactoringFinders;
+    }
+
     /**
      * Apply the refactoring sequence to a given program, without modifying the original program.
      *
@@ -145,8 +156,7 @@ private Refactoring getExecutedRefactoring(Program program, Integer nthProductio
 
     @Override
     public RefactorSequence copy() {
-        return new RefactorSequence(originalProgram, getMutation(), getCrossover(),
-                new ArrayList<>(productions), refactoringFinders);
+        return new RefactorSequence(this);
     }
 
     /*

src/main/java/de/uni_passau/fim/se2/litterbox/refactor/metaheuristics/chromosomes/Solution.java

@@ -72,6 +72,8 @@ protected Solution(Mutation<C> mutation, Crossover<C> crossover, Map<FitnessFunc
     protected Solution(C other) throws NullPointerException {
         super(other);
         this.fitnessMap = new LinkedHashMap<>(other.getFitnessMap());
+        this.rank = other.getRank();
+        this.distance = other.getDistance();
     }
 
     /**

src/main/java/de/uni_passau/fim/se2/litterbox/refactor/metaheuristics/search_operators/BinaryRankTournament.java

@@ -26,8 +26,6 @@
 
 public class BinaryRankTournament<C extends Solution<C>> implements Selection<C> {
 
-    public BinaryRankTournament() {
-    }
 
     /**
      * Selects a chromosome to be used as parent for mutation or crossover from the given non-null

src/test/java/de/uni_passau/fim/se2/litterbox/refactor/metaheuristics/search_operators/BinaryRankTournamentTest.java

@@ -110,8 +110,8 @@ void testSelectionByDistance() {
         refactorSequence1.setDistance(2.0);
         mockedRandomness.when(() -> Randomness.nextInt(2)).thenReturn(0).thenReturn(1);
         RefactorSequence candidate2 = selection.apply(population);
-        assertNotSame(refactorSequence1, candidate1);
-        assertEquals(refactorSequence1, candidate1);
+        assertNotSame(refactorSequence1, candidate2);
+        assertEquals(refactorSequence1, candidate2);
     }
 
     @Test