Changeset 8301

Timestamp:

07/18/12 16:15:20 (12 years ago)

Author:

spimming

Message:

#1894:

• graph routing algorithm plugin initial commit
• load data in problem

Location:

branches/RoutePlanning

Files:

• HeuristicLab.Algorithms.GraphRouting (added)
• HeuristicLab.Algorithms.GraphRouting/3.3 (added)
• HeuristicLab.Algorithms.GraphRouting/3.3/HeuristicLab.Algorithms.GraphRouting.csproj (added)
• HeuristicLab.Algorithms.GraphRouting/3.3/HeuristicLab.snk (added)
• HeuristicLab.Algorithms.GraphRouting/3.3/Plugin.cs.frame (added)
• HeuristicLab.Algorithms.GraphRouting/3.3/Properties (added)
• HeuristicLab.Algorithms.GraphRouting/3.3/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Problems.RoutePlanning.Test/Program.cs (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/RoutePlanningProblem.cs (modified) (7 diffs)
• RoutePlanning.sln (modified) (2 diffs)

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

@@ -9 +9 @@
       //string filepath = @"..\..\OsmTestFiles\testRelation1.osm";
       XmlDataSource xmlDs = new XmlDataSource(filepath);
-      xmlDs.ReadData();
+      //xmlDs.ReadData();
     }
   }

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

@@ -20 +20 @@
 #endregion
 
+using System.IO;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -26 +27 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.RoutePlanning.Osm;
+using HeuristicLab.Problems.RoutePlanning.Osm.Data;
 
 namespace HeuristicLab.Problems.RoutePlanning {
@@ -33 +36 @@
   public class RoutePlanningProblem : Problem {
     private const string CoordinatesParameterName = "Coordinates";
-    private const string FromParameterName = "From";
-    private const string ToParameterName = "To";
+    private const string SourceParameterName = "Source";
+    private const string TargetParameterName = "Target";
     public string Filename { get; set; }
+
+    IDataSource dataSource;
+    Graph.Graph graph;
 
     #region Parameter Properties
@@ -42 +48 @@
       get { return (OptionalValueParameter<DoubleMatrix>)Parameters[CoordinatesParameterName]; }
     }
-    public ValueParameter<IntValue> FromParameter {
-      get { return (ValueParameter<IntValue>)Parameters[FromParameterName]; }
+    public ValueParameter<IntValue> SourceParameter {
+      get { return (ValueParameter<IntValue>)Parameters[SourceParameterName]; }
     }
-    public ValueParameter<IntValue> ToParameter {
-      get { return (ValueParameter<IntValue>)Parameters[ToParameterName]; }
+    public ValueParameter<IntValue> TargetParameter {
+      get { return (ValueParameter<IntValue>)Parameters[TargetParameterName]; }
     }
 
@@ -58 +64 @@
     }
 
-    public IntValue From {
-      get { return FromParameter.Value; }
-      set { FromParameter.Value = value; }
+    public IntValue Source {
+      get { return SourceParameter.Value; }
+      set { SourceParameter.Value = value; }
     }
 
-    public IntValue To {
-      get { return ToParameter.Value; }
-      set { ToParameter.Value = value; }
+    public IntValue Target {
+      get { return TargetParameter.Value; }
+      set { TargetParameter.Value = value; }
     }
 
@@ -86 +92 @@
     public RoutePlanningProblem() {
       Parameters.Add(new OptionalValueParameter<DoubleMatrix>(CoordinatesParameterName, "The x- and y-Coordinates of the cities."));
-      Parameters.Add(new ValueParameter<IntValue>(FromParameterName, "From."));
-      Parameters.Add(new ValueParameter<IntValue>(ToParameterName, "To."));
+      Parameters.Add(new ValueParameter<IntValue>(SourceParameterName, "Source Node."));
+      Parameters.Add(new ValueParameter<IntValue>(TargetParameterName, "Target Node."));
 
       RegisterEventHandlers();
@@ -96 +102 @@
     private void RegisterEventHandlers() { }
 
+    public void LoadData(string file) {
+      FileInfo f = new FileInfo(file);
+      dataSource = new XmlDataSource(file);
+      graph = new Graph.Graph(dataSource);
+
+      Name = f.Name;
+
+      OnReset();
+    }
+
   }
 }

branches/RoutePlanning/RoutePlanning.sln

@@ -7 +7 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.RoutePlanning.Test", "HeuristicLab.Problems.RoutePlanning.Test\HeuristicLab.Problems.RoutePlanning.Test.csproj", "{004241D1-2127-4489-9DFB-9F7707983371}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.GraphRouting", "HeuristicLab.Algorithms.GraphRouting\HeuristicLab.Algorithms.GraphRouting.csproj", "{4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}"
 EndProject
 Global
@@ -48 +50 @@
     {004241D1-2127-4489-9DFB-9F7707983371}.Release|x86.ActiveCfg = Release|x86
     {004241D1-2127-4489-9DFB-9F7707983371}.Release|x86.Build.0 = Release|x86
+    {4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+    {4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+    {4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+    {4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+    {4FE72407-6CAA-4F41-9F2D-D45FDA19ED3C}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution