From ea5d1d6e66af7518ee1bc79e2e8c363831ac4817 Mon Sep 17 00:00:00 2001 From: Cavailles Kevin Date: Sat, 21 Mar 2020 00:02:19 +0100 Subject: [PATCH] =?UTF-8?q?Classe=20Launch=20compl=C3=A9t=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/insa/graphs/gui/simple/Launch.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java b/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java index 7be58b3..7868b89 100644 --- a/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java +++ b/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java @@ -14,6 +14,7 @@ import org.insa.graphs.gui.drawing.components.BasicDrawing; import org.insa.graphs.model.Graph; import org.insa.graphs.model.Path; import org.insa.graphs.model.io.BinaryGraphReader; +import org.insa.graphs.model.io.BinaryPathReader; import org.insa.graphs.model.io.GraphReader; import org.insa.graphs.model.io.PathReader; @@ -46,28 +47,31 @@ public class Launch { public static void main(String[] args) throws Exception { // Visit these directory to see the list of available files on Commetud. - final String mapName = "/home/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/insa.mapgr"; - final String pathName = "/home/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr31insa_rangueil_r2.path"; + final String mapName = "/Users/Kevin/Desktop/programmation/java_files/Maps/europe/france/insa.mapgr"; + final String pathName = "/Users/Kevin/Desktop/programmation/java_files/Paths/path_fr31insa_rangueil_insa.path"; // Create a graph reader. final GraphReader reader = new BinaryGraphReader( new DataInputStream(new BufferedInputStream(new FileInputStream(mapName)))); // TODO: Read the graph. - final Graph graph = null; + final Graph graph = reader.read(); // Create the drawing: final Drawing drawing = createDrawing(); // TODO: Draw the graph on the drawing. + drawing.drawGraph(graph); // TODO: Create a PathReader. - final PathReader pathReader = null; + final PathReader pathReader = new BinaryPathReader( + new DataInputStream( new BufferedInputStream(new FileInputStream(pathName)))); // TODO: Read the path. - final Path path = null; + final Path path = pathReader.readPath(graph); // TODO: Draw the path. + drawing.drawPath(path); } }