Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8438


Ignore:
Timestamp:
08/08/12 16:57:31 (12 years ago)
Author:
spimming
Message:

#1894 graph interface and implementation initial commit

Location:
branches/RoutePlanning
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning.Test/Program.cs

    r8434 r8438  
    2424      IDataSource ds = TestLoad(file6);
    2525      OsmGraph graph = new OsmGraph(ds);
    26       //TestRouter(new DijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
    27       //TestRouter(new AStarAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
     26      TestRouter(new DijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
     27      TestRouter(new AStarAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
    2828      TestRouter(new AStarAlgorithmV2(graph), 529102170, 31372732, false); // inz - hgb
    29       //TestRouter(new BidrectionalDijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
     29      TestRouter(new BidrectionalDijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
    3030
    3131      //TestLoadAndRouter(file6, typeof(DijkstraAlgorithm), 529102170, 31372732, false, false); // inz - hgb
  • branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Graph/Edge.cs

    r8300 r8438  
    1212    }
    1313
    14     public Edge(Vertex source, Vertex target) {
     14    private short category;
     15    public short Category {
     16      get { return category; }
     17      set { category = value; }
     18    }
     19
     20    public Edge(Vertex source, Vertex target)
     21      : this(source, target, 0) {
     22
     23    }
     24
     25    public Edge(Vertex source, Vertex target, short category) {
    1526      this.source = source;
    1627      this.target = target;
     28      this.category = category;
    1729    }
    1830
  • branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Graph/Vertex.cs

    r8434 r8438  
    2222    public Vertex(long id) {
    2323      this.id = id;
     24    }
     25
     26    public Vertex(long id, double longitude, double latitude) {
     27      this.id = id;
     28      this.longitude = longitude;
     29      this.latitude = latitude;
    2430    }
    2531
  • branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/HeuristicLab.Problems.RoutePlanning.csproj

    r8434 r8438  
    5757  <ItemGroup>
    5858    <Compile Include="Graph\Edge.cs" />
     59    <Compile Include="Graph\Graph.cs" />
     60    <Compile Include="Graph\IGraph.cs" />
    5961    <Compile Include="Graph\OsmGraph.cs" />
    6062    <Compile Include="Graph\IEdge.cs" />
    6163    <Compile Include="Graph\OsmVertex.cs" />
    6264    <Compile Include="Graph\Route.cs" />
     65    <Compile Include="Graph\Vertex.cs" />
    6366    <Compile Include="Osm.Data\XmlDataSource.cs" />
    6467    <Compile Include="Osm\IDataSource.cs" />
Note: See TracChangeset for help on using the changeset viewer.