Changeset 8429

Timestamp:

08/08/12 13:40:03 (12 years ago)

Author:

spimming

Message:

#1894

• renamed Graph to OsmGraph
• generic type in edge interface

Location:

branches/RoutePlanning

Files:

• HeuristicLab.Algorithms.GraphRouting/3.3/AStarAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.GraphRouting/3.3/AStarAlgorithmV2.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.GraphRouting/3.3/BidirectionalDijkstraAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.GraphRouting/3.3/DijkstraAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Problems.RoutePlanning.Test/Program.cs (modified) (3 diffs)
• HeuristicLab.Problems.RoutePlanning/3.3/Graph/Graph.cs (deleted)
• HeuristicLab.Problems.RoutePlanning/3.3/Graph/IEdge.cs (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/Graph/OsmGraph.cs (added)
• HeuristicLab.Problems.RoutePlanning/3.3/HeuristicLab.Problems.RoutePlanning.csproj (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/RoutePlanningProblem.cs (modified) (3 diffs)
• RoutePlanning.sln (modified) (1 diff)

branches/RoutePlanning/HeuristicLab.Algorithms.GraphRouting/3.3/AStarAlgorithm.cs

@@ -5 +5 @@
 namespace HeuristicLab.Algorithms.GraphRouting {
   public class AStarAlgorithm : IRouter {
-    private Graph graph;
+    private OsmGraph graph;
 
     private Dictionary<long, float> distances;
@@ -14 +14 @@
     private PriorityQueue<float, long> openList;
 
-    public AStarAlgorithm(Graph graph) {
+    public AStarAlgorithm(OsmGraph graph) {
       this.graph = graph;
     }

branches/RoutePlanning/HeuristicLab.Algorithms.GraphRouting/3.3/AStarAlgorithmV2.cs

@@ -5 +5 @@
 namespace HeuristicLab.Algorithms.GraphRouting {
   public class AStarAlgorithmV2 : IRouter {
-    private Graph graph;
+    private OsmGraph graph;
 
     private Dictionary<long, float> distances;
@@ -14 +14 @@
     private Dictionary<long, NodeData> openListLookup;
 
-    public AStarAlgorithmV2(Graph graph) {
+    public AStarAlgorithmV2(OsmGraph graph) {
       this.graph = graph;
     }

branches/RoutePlanning/HeuristicLab.Algorithms.GraphRouting/3.3/BidirectionalDijkstraAlgorithm.cs

@@ -5 +5 @@
 namespace HeuristicLab.Algorithms.GraphRouting {
   public class BidrectionalDijkstraAlgorithm : IRouter {
-    private Graph graph;
+    private OsmGraph graph;
 
     private HashSet<long> visitedNodesForward;
@@ -16 +16 @@
     private Dictionary<long, long> predecessorsBackward;
 
-    public BidrectionalDijkstraAlgorithm(Graph graph) {
+    public BidrectionalDijkstraAlgorithm(OsmGraph graph) {
       this.graph = graph;
     }

branches/RoutePlanning/HeuristicLab.Algorithms.GraphRouting/3.3/DijkstraAlgorithm.cs

@@ -5 +5 @@
 namespace HeuristicLab.Algorithms.GraphRouting {
   public class DijkstraAlgorithm : IRouter {
-    private Graph graph;
+    private OsmGraph graph;
 
     private HashSet<long> visitedNodes;
@@ -12 +12 @@
     private Dictionary<long, long> predecessors;
 
-    public DijkstraAlgorithm(Graph graph) {
+    public DijkstraAlgorithm(OsmGraph graph) {
       this.graph = graph;
     }

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning.Test/Program.cs

@@ -23 +23 @@
 
       IDataSource ds = TestLoad(file6);
-      Graph.Graph graph = new Graph.Graph(ds);
-      TestRouter(new DijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
-      TestRouter(new AStarAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
+      OsmGraph graph = new OsmGraph(ds);
+      //TestRouter(new DijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
+      //TestRouter(new AStarAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
       TestRouter(new AStarAlgorithmV2(graph), 529102170, 31372732, false); // inz - hgb
-      TestRouter(new BidrectionalDijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
+      //TestRouter(new BidrectionalDijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
 
       //TestLoadAndRouter(file6, typeof(DijkstraAlgorithm), 529102170, 31372732, false, false); // inz - hgb
@@ -96 +96 @@
       Console.WriteLine("Loading Time: {0}", sw.Elapsed);
       Console.WriteLine();
-      Graph.Graph graph = new Graph.Graph(xmlDs);
+      OsmGraph graph = new OsmGraph(xmlDs);
       IRouter router = (IRouter)Activator.CreateInstance(routerType, graph);
       Console.Write("Calculate route ... ");
@@ -122 +122 @@
     }
 
-    private static void WriteGPXFile(Graph.Graph graph, long[] route, string file) {
+    private static void WriteGPXFile(OsmGraph graph, long[] route, string file) {
       XmlWriterSettings settings = new XmlWriterSettings();
       settings.Indent = true;

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Graph/IEdge.cs

@@ -1 +1 @@
 
 namespace HeuristicLab.Problems.RoutePlanning.Graph {
-  public interface IEdge<Vertex> {
-    Vertex Source { get; }
-    Vertex Target { get; }
+  public interface IEdge<T> {
+    T Source { get; }
+    T Target { get; }
   }
 }

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/HeuristicLab.Problems.RoutePlanning.csproj

@@ -57 +57 @@
   <ItemGroup>
     <Compile Include="Graph\Edge.cs" />
-    <Compile Include="Graph\Graph.cs" />
+    <Compile Include="Graph\OsmGraph.cs" />
     <Compile Include="Graph\IEdge.cs" />
     <Compile Include="Graph\Route.cs" />

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/RoutePlanningProblem.cs

@@ -27 +27 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.RoutePlanning.Graph;
 using HeuristicLab.Problems.RoutePlanning.Osm;
 using HeuristicLab.Problems.RoutePlanning.Osm.Data;
@@ -41 +42 @@
 
     IDataSource dataSource;
-    Graph.Graph graph;
+    OsmGraph graph;
 
     #region Parameter Properties
@@ -105 +106 @@
       FileInfo f = new FileInfo(file);
       dataSource = new XmlDataSource(file);
-      graph = new Graph.Graph(dataSource);
+      graph = new OsmGraph(dataSource);
 
       Name = f.Name;

branches/RoutePlanning/RoutePlanning.sln

@@ -9 +9 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.GraphRouting", "HeuristicLab.Algorithms.GraphRouting\3.3\HeuristicLab.Algorithms.GraphRouting.csproj", "{4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9FD7CBFA-D7D9-4FA3-9038-CD867CA9B3B6}"
 EndProject
 Global