Changeset 8514 for branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3

Timestamp:

08/21/12 15:53:54 (12 years ago)

Author:

spimming

Message:

#1894: experimented with different settings in cost and heuristic function

File:

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

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

@@ -142 +142 @@
 
     public float GetWeight(Edge<Vertex> edge) {
-      double distance = Utils.Distance(edge.Source.Logitude, edge.Source.Latitude,
-                                       edge.Target.Logitude, edge.Target.Latitude);
-      //double distance = Utils.LocationDistance(source.Node.Point, target.Node.Point);
+      //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);
+
       int speed = edge.GetMaxSpeed();
+      double weight = (distance / speed) * 60;
       //double weight = (distance / speed) * 3.6;
-      double weight = (distance / speed);
+      //double weight = (distance / speed);
+      //double weight = distance;
       return (float)weight;
     }
@@ -158 +164 @@
 
     public float EstimatedCosts(Vertex source, Vertex target) {
-      double distance = Utils.Distance(source.Logitude, source.Latitude,
-                                       target.Logitude, target.Latitude);
-      //double distance = Utils.LocationDistance(source.Node.Point, target.Node.Point);
-      int speed = 10;
+      //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);
+
+      //int speed = 130;
+      //int speed = 10;
+      int speed = 1;
+      double costs = (distance / speed) * 60;
       //double costs = (distance / speed) * 3.6;
-      double costs = (distance / speed);
+      //double costs = (distance / speed);
+      //double costs = distance;
       return (float)costs;
     }