Added more test cases

This commit is contained in:
Arnaud Vergnet 2020-05-22 14:53:53 +02:00
parent e8331864ab
commit ac18c2d522

View file

@ -27,7 +27,7 @@ public abstract class AlgoTest {
protected ArrayList<PathDataset> invalidTestData; protected ArrayList<PathDataset> invalidTestData;
// Graphs to use // Graphs to use
private Graph graphInsa, graphSquare, graphBretagne; private Graph graphInsa, graphSquare, graphBretagne, graphGuadeloupe;
/** /**
* Class used to store all data related to a path and its computed solutions * Class used to store all data related to a path and its computed solutions
@ -129,6 +129,7 @@ public abstract class AlgoTest {
graphInsa = readGraph("../Maps/insa.mapgr"); graphInsa = readGraph("../Maps/insa.mapgr");
graphSquare = readGraph("../Maps/carre.mapgr"); graphSquare = readGraph("../Maps/carre.mapgr");
graphBretagne = readGraph("../Maps/bretagne.mapgr"); graphBretagne = readGraph("../Maps/bretagne.mapgr");
graphGuadeloupe = readGraph("../Maps/guadeloupe.mapgr");
} }
/** /**
@ -139,20 +140,23 @@ public abstract class AlgoTest {
filterTime = ArcInspectorFactory.getAllFilters().get(2); filterTime = ArcInspectorFactory.getAllFilters().get(2);
} }
private PathDataset getNewPathDataset(Graph graph, int originID, int destinationID) {
return new PathDataset(
graph,
graph.getNodes().get(originID),
graph.getNodes().get(destinationID)
);
}
/** /**
* Creates valid data sets * Creates valid data sets
*/ */
private void initValidPathList() { private void initValidPathList() {
validTestData = new ArrayList<>(); validTestData = new ArrayList<>();
validTestData.add(new PathDataset( validTestData.add(getNewPathDataset(graphInsa, 512, 526));
graphInsa, validTestData.add(getNewPathDataset(graphGuadeloupe, 12822, 13687));
graphInsa.getNodes().get(512), validTestData.add(getNewPathDataset(graphSquare, 21, 17));
graphInsa.getNodes().get(526)));
validTestData.add(new PathDataset(
graphSquare,
graphSquare.getNodes().get(21),
graphSquare.getNodes().get(17)));
} }
/** /**
@ -161,15 +165,10 @@ public abstract class AlgoTest {
private void initInvalidPathList() { private void initInvalidPathList() {
invalidTestData = new ArrayList<>(); invalidTestData = new ArrayList<>();
invalidTestData.add(new PathDataset( invalidTestData.add(getNewPathDataset(graphBretagne, 29270, 545599));
graphBretagne, invalidTestData.add(getNewPathDataset(graphGuadeloupe, 26963, 4307));
graphBretagne.getNodes().get(29270), invalidTestData.add(getNewPathDataset(graphGuadeloupe, 8185, 8185));
graphBretagne.getNodes().get(545599))); invalidTestData.add(getNewPathDataset(graphSquare, 10, 10));
invalidTestData.add(new PathDataset(
graphSquare,
graphSquare.getNodes().get(10),
graphSquare.getNodes().get(10)));
} }
/** /**