Changeset 8438 for branches/RoutePlanning

Timestamp:

08/08/12 16:57:31 (12 years ago)

Author:

spimming

Message:

#1894 graph interface and implementation initial commit

Location:

branches/RoutePlanning

Files:

• HeuristicLab.Problems.RoutePlanning.Test/Program.cs (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/Graph/Edge.cs (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/Graph/Graph.cs (added)
• HeuristicLab.Problems.RoutePlanning/3.3/Graph/IGraph.cs (added)
• HeuristicLab.Problems.RoutePlanning/3.3/Graph/Vertex.cs (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/HeuristicLab.Problems.RoutePlanning.csproj (modified) (1 diff)

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

@@ -24 +24 @@
       IDataSource ds = TestLoad(file6);
       OsmGraph graph = new OsmGraph(ds);
-      //TestRouter(new DijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
-      //TestRouter(new AStarAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
+      TestRouter(new DijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
+      TestRouter(new AStarAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
       TestRouter(new AStarAlgorithmV2(graph), 529102170, 31372732, false); // inz - hgb
-      //TestRouter(new BidrectionalDijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
+      TestRouter(new BidrectionalDijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
 
       //TestLoadAndRouter(file6, typeof(DijkstraAlgorithm), 529102170, 31372732, false, false); // inz - hgb

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

@@ -12 +12 @@
     }
 
-    public Edge(Vertex source, Vertex target) {
+    private short category;
+    public short Category {
+      get { return category; }
+      set { category = value; }
+    }
+
+    public Edge(Vertex source, Vertex target)
+      : this(source, target, 0) {
+
+    }
+
+    public Edge(Vertex source, Vertex target, short category) {
       this.source = source;
       this.target = target;
+      this.category = category;
     }
 

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

@@ -22 +22 @@
     public Vertex(long id) {
       this.id = id;
+    }
+
+    public Vertex(long id, double longitude, double latitude) {
+      this.id = id;
+      this.longitude = longitude;
+      this.latitude = latitude;
     }
 

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\IGraph.cs" />
     <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" />