From 77f209b2aa553535d9f1afaf9bbbff5042ed7f1c Mon Sep 17 00:00:00 2001 From: hummel Date: Tue, 15 Apr 2025 10:46:59 +0200 Subject: [PATCH] Kleine Verbesserungen --- .gitignore | 3 +++ .../informatik/routenplaner/domain/Road.java | 3 +-- .../informatik/routenplaner/domain/Routeplaner.java | 13 +++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 9154f4c..cd46325 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ hs_err_pid* replay_pid* +/bin/ +/.classpath +/.project diff --git a/Routenplaner/src/de/th_mannheim/informatik/routenplaner/domain/Road.java b/Routenplaner/src/de/th_mannheim/informatik/routenplaner/domain/Road.java index 31deee5..625b760 100644 --- a/Routenplaner/src/de/th_mannheim/informatik/routenplaner/domain/Road.java +++ b/Routenplaner/src/de/th_mannheim/informatik/routenplaner/domain/Road.java @@ -7,7 +7,6 @@ public class Road { private final int distance; public Road(City start, City destination, int distance) { - super(); this.start = start; this.destination = destination; this.distance = distance; @@ -17,7 +16,7 @@ public class Road { return start; } - public City getTarget() { + public City getDestination() { return destination; } diff --git a/Routenplaner/src/de/th_mannheim/informatik/routenplaner/domain/Routeplaner.java b/Routenplaner/src/de/th_mannheim/informatik/routenplaner/domain/Routeplaner.java index 02f24fd..5615064 100644 --- a/Routenplaner/src/de/th_mannheim/informatik/routenplaner/domain/Routeplaner.java +++ b/Routenplaner/src/de/th_mannheim/informatik/routenplaner/domain/Routeplaner.java @@ -24,10 +24,7 @@ public class Routeplaner { City startCity = cities.get(start); startCity.checkAndSetDistance(startCity, startCity, 0); - LinkedList connections = startCity.getConnections(); - - this.processCandidates(startCity, connections, candidates); - startCity.setExplored(); + candidates.add(startCity); // --------------------------------------- @@ -35,7 +32,7 @@ public class Routeplaner { while (!candidates.isEmpty()) { City current = candidates.removeFirst(); - this.processCandidates(current, current.getConnections(), candidates); + this.processCandidates(current, candidates); current.setExplored(); } @@ -50,9 +47,9 @@ public class Routeplaner { return waypoints; } - private void processCandidates(City start, LinkedList connections, TreeSet candidates) { - for (Road r : connections) { - City other = r.getTarget(); + private void processCandidates(City start, TreeSet candidates) { + for (Road r : start.getConnections()) { + City other = r.getDestination(); if (other.isExplored()) continue;