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

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/HeuristicLab.Problems.RoutePlanning/3.3

Files:

• Graph/Graph.cs (deleted)
• Graph/IEdge.cs (modified) (1 diff)
• Graph/OsmGraph.cs (added)
• HeuristicLab.Problems.RoutePlanning.csproj (modified) (1 diff)
• RoutePlanningProblem.cs (modified) (3 diffs)

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;