Changeset 8488 for branches

Timestamp:

08/14/12 14:31:45 (12 years ago)

Author:

spimming

Message:

#1894:

• introduced weight property in Edge
• new data source implementation for DIMACS graphs
• lightweight data source implementation for osm graphs
• cost calculator interface and implementations added

Location:

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3

Files:

• DIMACS/DIMACSDataSource.cs (modified) (1 diff)
• Graph/EarthDistanceCostCalculator.cs (added)
• Graph/Edge.cs (modified) (1 diff)
• Graph/ICostCalculator.cs (added)
• Graph/TravelTimeCostCalculator.cs (added)
• HeuristicLab.Problems.RoutePlanning.csproj (modified) (2 diffs)
• Osm.Data/OsmDataSource.cs (added)

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/DIMACS/DIMACSDataSource.cs

@@ -118 +118 @@
               Vertex vSrc = graph.GetVertex(src);
               Vertex vDst = graph.GetVertex(dst);
+
               Edge<Vertex> edge = new Edge<Vertex>(vSrc, vDst);
-              //TODO  len = weight
+              edge.Weight = len;
+
               graph.AddEdge(edge);
 

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

@@ -16 +16 @@
       get { return category; }
       set { category = value; }
+    }
+
+    private float weight;
+    public float Weight {
+      get { return weight; }
+      set { weight = value; }
     }
 

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

@@ -58 +58 @@
   <ItemGroup>
     <Compile Include="DIMACS\DIMACSDataSource.cs" />
+    <Compile Include="Graph\EarthDistanceCostCalculator.cs" />
+    <Compile Include="Graph\ICostCalculator.cs" />
     <Compile Include="Graph\Edge.cs" />
     <Compile Include="Graph\Graph.cs" />
@@ -65 +67 @@
     <Compile Include="Graph\OsmVertex.cs" />
     <Compile Include="Graph\Route.cs" />
+    <Compile Include="Graph\TravelTimeCostCalculator.cs" />
     <Compile Include="Graph\Vertex.cs" />
+    <Compile Include="Osm.Data\OsmDataSource.cs" />
     <Compile Include="Osm.Data\XmlDataSource.cs" />
     <Compile Include="Osm\IDataSource.cs" />