Changeset 8520 for branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/RoutingGraph/Graph.cs

Timestamp:

08/22/12 19:14:33 (12 years ago)

Author:

spimming

Message:

#1894:

• extended datasource interface to get routing graph for a specific vehicle type
• use ICostCalculator to calculate edge weights
• moved common enums in own file
• removed method to estimate cost from graph; use ICostCalculator

File:

• branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/RoutingGraph/Graph.cs (modified) (3 diffs)

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

@@ -3 +3 @@
 using System.Collections.Generic;
 using HeuristicLab.Problems.RoutePlanning.Interfaces;
-using HeuristicLab.Problems.RoutePlanning.Utilities;
 namespace HeuristicLab.Problems.RoutePlanning.RoutingGraph {
   public class Graph : IGraph {
@@ -126 +125 @@
       foreach (Edge<Vertex> edge in edges) {
         // TODO: check if edge can be traversed (eg. highway tag for car roads, ...)
-        float weight = GetWeight(edge); // TODO:  edge.Weight?
-        neighbors[edge.Target.Id] = weight;
+        //float weight = GetWeight(edge); // TODO:  edge.Weight?
+        //neighbors[edge.Target.Id] = weight;
+        neighbors[edge.Target.Id] = edge.Weight;
       }
       return neighbors;
@@ -136 +136 @@
       foreach (Edge<Vertex> edge in edges) {
         // TODO: check if edge can be traversed (eg. highway tag for car roads, ...)
-        float weight = GetWeight(edge); // TODO:  edge.Weight?
-        neighbors[edge.Source.Id] = weight;
+        //float weight = GetWeight(edge); // TODO:  edge.Weight?
+        //neighbors[edge.Source.Id] = weight;
+        neighbors[edge.Source.Id] = edge.Weight;
       }
       return neighbors;
     }
 
-    public float GetWeight(Edge<Vertex> edge) {
-      //double distance = Utils.Distance(edge.Source.Logitude, edge.Source.Latitude,
-      //                                 edge.Target.Logitude, edge.Target.Latitude);
+    //public float GetWeight(Edge<Vertex> edge) {
+    //  //double distance = Utils.Distance(edge.Source.Logitude, edge.Source.Latitude,
+    //  //                                 edge.Target.Logitude, edge.Target.Latitude);
 
-      PointD s = new PointD(edge.Source.Logitude, edge.Source.Latitude);
-      PointD t = new PointD(edge.Target.Logitude, edge.Target.Latitude);
-      double distance = Utils.LocationDistance(s, t);
+    //  PointD s = new PointD(edge.Source.Logitude, edge.Source.Latitude);
+    //  PointD t = new PointD(edge.Target.Logitude, edge.Target.Latitude);
+    //  double distance = Utils.LocationDistance(s, t);
 
-      int speed = edge.GetMaxSpeed();
-      double weight = (distance / speed) * 60;
-      //double weight = (distance / speed) * 3.6;
-      //double weight = (distance / speed);
-      //double weight = distance;
-      return (float)weight;
-    }
+    //  //int speed = edge.GetMaxSpeed();
+    //  //double weight = (distance / speed) * 60;
+    //  //double weight = (distance / speed) * 3.6;
+    //  //double weight = (distance / speed);
+    //  //double weight = distance;
+    //  //return (float)weight;
+    //  return (float)1;
+    //}
 
-    public float EstimatedCosts(long sourceId, long targetId) {
-      Vertex source = GetVertex(sourceId);
-      Vertex target = GetVertex(targetId);
-      return EstimatedCosts(source, target);
-    }
+    //public float EstimatedCosts(long sourceId, long targetId) {
+    //  Vertex source = GetVertex(sourceId);
+    //  Vertex target = GetVertex(targetId);
+    //  return EstimatedCosts(source, target);
+    //}
 
-    public float EstimatedCosts(Vertex source, Vertex target) {
-      //double distance = Utils.Distance(source.Logitude, source.Latitude,
-      //                                 target.Logitude, target.Latitude);
+    //public float EstimatedCosts(Vertex source, Vertex target) {
+    //  //double distance = Utils.Distance(source.Logitude, source.Latitude,
+    //  //                                 target.Logitude, target.Latitude);
 
-      PointD s = new PointD(source.Logitude, source.Latitude);
-      PointD t = new PointD(target.Logitude, target.Latitude);
-      double distance = Utils.LocationDistance(s, t);
+    //  PointD s = new PointD(source.Logitude, source.Latitude);
+    //  PointD t = new PointD(target.Logitude, target.Latitude);
+    //  double distance = Utils.LocationDistance(s, t);
 
-      //int speed = 130;
-      //int speed = 10;
-      int speed = 130;
-      double costs = (distance / speed) * 60;
-      //double costs = (distance / speed) * 3.6;
-      //double costs = (distance / speed);
-      //double costs = distance;
-      return (float)costs;
-    }
+    //  //int speed = 130;
+    //  //int speed = 10;
+    //  int speed = 130;
+    //  double costs = (distance / speed) * 60;
+    //  //double costs = (distance / speed) * 3.6;
+    //  //double costs = (distance / speed);
+    //  //double costs = distance;
+    //  return (float)costs;
+    //}
   }
 }