From d1dd889c1bb243bdbae13a4fb5a206e33e357c02 Mon Sep 17 00:00:00 2001
From: Bafo <fofana@insa-toulouse.fr>
Date: Tue, 28 Mar 2023 17:49:16 +0200
Subject: [PATCH] Launch valide

---
 .../org/insa/graphs/gui/simple/Launch.java    |  17 ++++++++++++-----
 .../org/insa/graphs/gui/simple/Launch$1.class | Bin 1240 -> 1240 bytes
 .../org/insa/graphs/gui/simple/Launch.class   | Bin 1839 -> 2453 bytes
 3 files changed, 12 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..dc447da 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
@@ -1,7 +1,9 @@
 package org.insa.graphs.gui.simple;
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.color.*;
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.FileInputStream;
@@ -14,6 +16,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 +49,32 @@ 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 = "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/insa.mapgr";
+        final String pathName = "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr31insa_rangueil_r2.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,Color.green);
+
     }
 
 }
diff --git a/be-graphes-gui/target/classes/org/insa/graphs/gui/simple/Launch$1.class b/be-graphes-gui/target/classes/org/insa/graphs/gui/simple/Launch$1.class
index ec3f97304f9f023fa22d89b2bbb701e53bfc48de..4fdcf7d9e554f17f5329243365e61a77bb865fc2 100644
GIT binary patch
delta 47
zcmcb?d4qEU8w;b-WOkMkSycuu1~mpz26YB01`P&z22BP71}z2)25kl#2A#<>SR4S$
CMhAWX

delta 47
zcmcb?d4qEU8w;cSWOkMkStSN824x0O1{DS=22}=m1~mo)26YAt1`P%q2F=McSR4S!
C2?t{U

diff --git a/be-graphes-gui/target/classes/org/insa/graphs/gui/simple/Launch.class b/be-graphes-gui/target/classes/org/insa/graphs/gui/simple/Launch.class
index e633107d52eaedc4666c8380bd2e113d5e6f4cad..6e8b432b5502328d07b3e0dacc44e5892a4bc913 100644
GIT binary patch
delta 692
zcmZ9K?N3r+6u^Jag?le=5zDmERz&E6H6op^gkD8ci^M1qvKMcGnjsW2U0>=isEx7y
zjMmH#WNv=yQ(ww|sC6#5T;1)t=Q(e`bDo{^+5fR8@Z<NlJz$usiKYlQ_m4L}9oZVp
zYkE4dR&BK2YvX$1;C6A_bo48)mn&Q|xvJ=I4LX9SChOL#m0Z~>mFqsPb3@^*i>3%g
zV;PC)YyEN>y&e=}KKvZ@GR`fN2}Pv2AL;Wk$&|ufs#}{Kl;TYEZ=NfbH@U5d2`F@O
z)@mG7@-WS)m%C(5W`tyS5;}DInB|_rWjA756{$m})@`d`J5p}$GiUNZ;a{~jtc11M
zNTh3(n!F{?yh2~Dm&;W}AoH&~Wj~|n;~@)D$8Nq`XR%wSw*&t_r}^`AZ*8MouUK!^
z6Lv(ltE9F^oF9}r(fY3E-C<murH2cxh!ORu0B$irqcvv?yo>LUQY4*UxtY|1deFH;
zT4R^#;x6aq#N{N4$Ii7GY%|>EQky$TBWT!x8I7bVIp!B~I}{wuZwXh!BmW_Mojq_c
zg2836jS?0)Aj6K!REHQN#l%|{m|}?x>&)Pllw7wt9`RT-2d{a;Q<=3vl|{K}g2-a=
sOnh+}^>a!%JGioNbm0YAW<}zcWI0~2ifke;g{4tpO{Bd!eIn)i19>Wr(f|Me

delta 292
zcmXw!NlF7z6h+UkK4naV1cyq%f<lR=j0P;DCR+9#C<I)9;6xm_05>2)C|rg}$V41C
z7H4k3g^1UPfAH?>?&1B%%5!Pr<NNguSmM;jGSvE?)&A4?An93Nws3WGeVN}|nRoG@
zHioV}W5N(ayGV)h@Z5Varka2Gy}}d$(^QztyFncCPC*T^^V=Z0GpX~!YU-NQGpRpN
z-y&3;9mNEjMLd>OwWvuWR)}d+r%Qv3CcBJj|Ll*+8tbZT5;o}Q9FKWzc0`RRv&oib
oF-1AIaj3WO*%87O%wdmx8Je;kaHxsJ(deLKPNcuTo0RJP02Kizd;kCd