diff --git a/Executable/Program.cs b/Executable/Program.cs index b985c17..ec3856f 100644 --- a/Executable/Program.cs +++ b/Executable/Program.cs @@ -1,4 +1,4 @@ -using Graph; +using GeoGraph; using Logging; using astar; using OSM_XML_Importer; @@ -43,7 +43,7 @@ switch (args.Length) return; } -Graph.Graph graph = Importer.Import(xmlPath, onlyJunctions, logger); +Graph graph = Importer.Import(xmlPath, onlyJunctions, logger); Random r = new(); Route _route; diff --git a/astar/Astar.cs b/astar/Astar.cs index 50c42dc..48d77d8 100644 --- a/astar/Astar.cs +++ b/astar/Astar.cs @@ -1,6 +1,6 @@ using Logging; -using Graph; -using Graph.Utils; +using GeoGraph; +using GeoGraph.Utils; namespace astar { @@ -10,7 +10,7 @@ namespace astar private Dictionary goalDistance = new(); private Dictionary previousNode = new(); - public Route FindPath(Graph.Graph graph, Node start, Node goal, Logger? logger) + public Route FindPath(Graph graph, Node start, Node goal, Logger? logger) { logger?.Log(LogLevel.INFO, "From {0:000.00000}#{1:000.00000} to {2:000.00000}#{3:000.00000} Great-Circle {4:00000.00}km", start.lat, start.lon, goal.lat, goal.lon, Utils.DistanceBetweenNodes(start, goal)/1000); List toVisit = new(); diff --git a/astar/Route.cs b/astar/Route.cs index e81986a..f42386a 100644 --- a/astar/Route.cs +++ b/astar/Route.cs @@ -1,4 +1,4 @@ -using Graph; +using GeoGraph; namespace astar { public class Route