Changeset 8434

Timestamp:

08/08/12 14:12:50 (12 years ago)

Author:

spimming

Message:

#1894

• renamed old Vertex<T> to OsmVertex<T>
• added new Vertex class

Location:

branches/RoutePlanning

Files:

• HeuristicLab.Problems.RoutePlanning.Test/Program.cs (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/Graph/OsmGraph.cs (modified) (6 diffs)
• HeuristicLab.Problems.RoutePlanning/3.3/Graph/OsmVertex.cs (copied) (copied from branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Graph/Vertex.cs) (3 diffs)
• HeuristicLab.Problems.RoutePlanning/3.3/Graph/Vertex.cs (added)
• HeuristicLab.Problems.RoutePlanning/3.3/HeuristicLab.Problems.RoutePlanning.csproj (modified) (1 diff)

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

@@ -133 +133 @@
 
         foreach (long nodeId in route) {
-          Vertex<Node> node = graph.GetVertex(nodeId);
+          OsmVertex<Node> node = graph.GetVertex(nodeId);
           writer.WriteStartElement("wpt");
           writer.WriteAttributeString("lat", XmlConvert.ToString(node.Node.Latitude));

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

@@ -10 +10 @@
     }
 
-    public Vertex<Node> GetVertex(long id) {
-      return new Vertex<Node>(dataSource.GetNode(id));
+    public OsmVertex<Node> GetVertex(long id) {
+      return new OsmVertex<Node>(dataSource.GetNode(id));
     }
 
-    public List<Way> GetEdges(Vertex<Node> vertex) {
+    public List<Way> GetEdges(OsmVertex<Node> vertex) {
       return dataSource.GetWays(vertex.Node);
     }
 
     public Dictionary<long, float> GetNeighbors(long id) {
-      Vertex<Node> vertex = GetVertex(id);
+      OsmVertex<Node> vertex = GetVertex(id);
       Dictionary<long, float> neighbors = new Dictionary<long, float>();
       List<Way> edges = GetEdges(vertex);
@@ -26 +26 @@
 
         // get all naighbours of current vertex on this edge
-        List<Vertex<Node>> vertices = GetNeighborVerticesOnEdge(edge, vertex);
-        foreach (Vertex<Node> neighbor in vertices) {
+        List<OsmVertex<Node>> vertices = GetNeighborVerticesOnEdge(edge, vertex);
+        foreach (OsmVertex<Node> neighbor in vertices) {
           if (edge.CanBeTraversed(vertex.Node, neighbor.Node)) {
             float weight = GetWeight(edge, vertex, neighbor);
@@ -38 +38 @@
 
     public Dictionary<long, float> GetNeighborsReversed(long id) {
-      Vertex<Node> vertex = GetVertex(id);
+      OsmVertex<Node> vertex = GetVertex(id);
       Dictionary<long, float> neighbors = new Dictionary<long, float>();
       List<Way> edges = GetEdges(vertex);
       foreach (Way edge in edges) {
-        List<Vertex<Node>> vertices = GetNeighborVerticesOnEdge(edge, vertex);
-        foreach (Vertex<Node> neighbor in vertices) {
+        List<OsmVertex<Node>> vertices = GetNeighborVerticesOnEdge(edge, vertex);
+        foreach (OsmVertex<Node> neighbor in vertices) {
           if (edge.CanBeTraversed(neighbor.Node, vertex.Node)) {
             float weight = GetWeight(edge, vertex, neighbor);
@@ -53 +53 @@
     }
 
-    public List<Vertex<Node>> GetNeighborVerticesOnEdge(Way edge, Vertex<Node> vertex) {
-      List<Vertex<Node>> neighbors = new List<Vertex<Node>>();
+    public List<OsmVertex<Node>> GetNeighborVerticesOnEdge(Way edge, OsmVertex<Node> vertex) {
+      List<OsmVertex<Node>> neighbors = new List<OsmVertex<Node>>();
       for (int i = 0; i < edge.Nodes.Count; i++) {
         Node node = edge.Nodes[i];
@@ -69 +69 @@
     }
 
-    public float GetWeight(Way edge, Vertex<Node> source, Vertex<Node> target) {
+    public float GetWeight(Way edge, OsmVertex<Node> source, OsmVertex<Node> target) {
       double distance = Utils.Distance(source.Node.Point, target.Node.Point);
       int speed = edge.GetMaxSpeed();
@@ -77 +77 @@
 
     public float EstimatedCosts(long sourceId, long targetId) {
-      Vertex<Node> source = GetVertex(sourceId);
-      Vertex<Node> target = GetVertex(targetId);
+      OsmVertex<Node> source = GetVertex(sourceId);
+      OsmVertex<Node> target = GetVertex(targetId);
       return EstimatedCosts(source, target);
     }
 
-    public float EstimatedCosts(Vertex<Node> source, Vertex<Node> target) {
+    public float EstimatedCosts(OsmVertex<Node> source, OsmVertex<Node> target) {
       double distance = Utils.Distance(source.Node.Point, target.Node.Point);
       int speed = 130;

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

@@ -1 @@
-
-namespace HeuristicLab.Problems.RoutePlanning.Graph {
-  public class Vertex<T> {
+namespace HeuristicLab.Problems.RoutePlanning.Graph {
+  public class OsmVertex<T> {
     private static long idCounter = 0;
 
@@ -14 +13 @@
     }
 
-    public Vertex(T node) {
+    public OsmVertex(T node) {
       this.node = node;
       this.id = idCounter++;
     }
 
-    public static bool operator ==(Vertex<T> v1, Vertex<T> v2) {
+    public static bool operator ==(OsmVertex<T> v1, OsmVertex<T> v2) {
       if ((object)v1 == null) {
         if ((object)v2 == null) {
@@ -32 +31 @@
     }
 
-    public static bool operator !=(Vertex<T> v1, Vertex<T> v2) {
+    public static bool operator !=(OsmVertex<T> v1, OsmVertex<T> v2) {
       return !(v1 == v2);
     }
 
     public override bool Equals(object obj) {
-      if (obj is Vertex<T>) {
-        Vertex<T> graph = (obj as Vertex<T>);
+      if (obj is OsmVertex<T>) {
+        OsmVertex<T> graph = (obj as OsmVertex<T>);
         return this.Equals(graph);
       }

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

@@ -59 +59 @@
     <Compile Include="Graph\OsmGraph.cs" />
     <Compile Include="Graph\IEdge.cs" />
+    <Compile Include="Graph\OsmVertex.cs" />
     <Compile Include="Graph\Route.cs" />
-    <Compile Include="Graph\Vertex.cs" />
     <Compile Include="Osm.Data\XmlDataSource.cs" />
     <Compile Include="Osm\IDataSource.cs" />