be-graphes-model/src/main/java/org/insa/graphs/model/Node.java

@@ -157,9 +157,6 @@ public final class Node { //implements Comparable<Node> {
     //     return Integer.compare(getId(), other.getId());
     // }
 
-    /*
-     * Remove a successor arc. Used for the marathon path-finding algorithm.
-     */
     public void removeArc(Arc arcToRemove) {
         successors.remove(arcToRemove);
     }

be-graphes-model/src/main/java/org/insa/graphs/model/Path.java

@@ -115,7 +115,7 @@ public class Path {
      *         map do not match, or the end of a path is not the beginning of the
      *         next).
      */
-    public static Path concatenate(Path... paths) throws IllegalArgumentException {
+    public static Path concatenate(int indice, Path... paths) throws IllegalArgumentException {
         if (paths.length == 0) {
             throw new IllegalArgumentException("Cannot concatenate an empty list of paths.");
         }
@@ -128,7 +128,7 @@ public class Path {
         }
         ArrayList<Arc> arcs = new ArrayList<>();
         for (Path path: paths) {
-            arcs.addAll(path.getArcs());
+            arcs.addAll(indice, path.getArcs());
         }
         Path path = new Path(paths[0].getGraph(), arcs);
         if (!path.isValid()) {

be-graphes-model/src/test/java/org/insa/graphes/model/PathTest.java

@@ -15,7 +15,6 @@ import org.insa.graphs.model.Path;
 import org.insa.graphs.model.RoadInformation;
 import org.insa.graphs.model.RoadInformation.RoadType;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class PathTest {
@@ -84,7 +83,6 @@ public class PathTest {
     }
 
     @Test(expected = UnsupportedOperationException.class)
-    @Ignore // Mutability required for marathon path-finding algo
     public void testImmutability() {
         emptyPath.getArcs().add(a2b);
     }