From 29e95072f3f59d31344950ae5581460e189a52f5 Mon Sep 17 00:00:00 2001 From: AngeHerman Date: Mon, 29 Apr 2024 18:10:38 +0200 Subject: [PATCH] Test release added --- src/main/java/fr/u_paris/gla/project/App.java | 28 +++++++++++++++++++ .../u_paris/gla/project/itinerary/Parse.java | 3 ++ 2 files changed, 31 insertions(+) diff --git a/src/main/java/fr/u_paris/gla/project/App.java b/src/main/java/fr/u_paris/gla/project/App.java index 08e16a4..ca83602 100644 --- a/src/main/java/fr/u_paris/gla/project/App.java +++ b/src/main/java/fr/u_paris/gla/project/App.java @@ -7,6 +7,7 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; +import java.util.List; import java.util.Properties; import javax.imageio.ImageIO; @@ -15,6 +16,11 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.WindowConstants; +import fr.u_paris.gla.project.itinerary.Finder; +import fr.u_paris.gla.project.itinerary.Parse; +import fr.u_paris.gla.project.itinerary.Path; +import fr.u_paris.gla.project.itinerary.Stop; + /** Simple application model. * * @author Emmanuel Bigeon */ @@ -60,9 +66,31 @@ public class App { showLogo(); } } + }else{ + testRelease(); } } + public static void testRelease(){ + Parse parse = new Parse(); + parse.parseFiles(); + Stop source = parse.getTmp().get("Porte d'Ivry").get(0); + Stop destination = parse.getTmp().get("Châtelet").get(0); + System.out.println("Itinéraire de Porte d'Ivry à Châtelet"); + List result = parse.getItinerary(source, destination, 43200); + for(Path element : result){ + System.out.println(element.getCurrentStop()); + } + System.out.println("°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°"); + System.out.println("Itinéraire de Porte d'Ivry à Châtelet"); + source = parse.getTmp().get("Saint-Jacques").get(0); + destination = parse.getTmp().get("Porte d'Ivry").get(0); + result = parse.getItinerary(source, destination, 43200); + for(Path element : result){ + System.out.println(element.getCurrentStop()); + } + + } /** @param out the output stream */ public static void printAppInfos(PrintStream out) { Properties props = readApplicationProperties(); diff --git a/src/main/java/fr/u_paris/gla/project/itinerary/Parse.java b/src/main/java/fr/u_paris/gla/project/itinerary/Parse.java index 1b9f257..5f97384 100644 --- a/src/main/java/fr/u_paris/gla/project/itinerary/Parse.java +++ b/src/main/java/fr/u_paris/gla/project/itinerary/Parse.java @@ -59,6 +59,9 @@ public class Parse { return new double[] {Double.parseDouble(stringCoords[0]), Double.parseDouble(stringCoords[1])}; } + public HashMap> getTmp(){ + return tmp; + } /** * Searchs for a stop with the same name and GPS coordinates in the graph, and creates it if non existant * @param nodes a graph of the stops