Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8512


Ignore:
Timestamp:
08/21/12 13:40:38 (12 years ago)
Author:
spimming
Message:

#1894: tweaking of max edge speeds and heuristic cost function

Location:
branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r8488 r8512  
    6262        case 21:
    6363        case 24:
     64        case 16:
     65        case 20:
     66        case 15:
     67        case 12:
    6468        case 0:
    6569          speed = 1;
    6670          break;
    6771
    68         case 20:
    69         case 15:
    70         case 12:
    7172        case 11:
     73        case 14:
    7274          speed = 15;
    7375          break;
    7476
    7577        case 19:
    76         case 16:
    7778          speed = 30;
    7879          break;
    … …  
    8586          break;
    8687
    87         case 14:
    8888        case 13:
    8989          speed = 50;

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

    r8509 r8512  
    146146      //double distance = Utils.LocationDistance(source.Node.Point, target.Node.Point);
    147147      int speed = edge.GetMaxSpeed();
    148       double weight = (distance / speed) * 3.6;
    149       //double weight = (distance / speed);
     148      //double weight = (distance / speed) * 3.6;
     149      double weight = (distance / speed);
    150150      return (float)weight;
    151151    }
    … …  
    161161                                       target.Logitude, target.Latitude);
    162162      //double distance = Utils.LocationDistance(source.Node.Point, target.Node.Point);
    163       int speed = 130;
    164       double costs = (distance / speed) * 3.6;
    165       //double costs = (distance / speed);
     163      int speed = 10;
     164      //double costs = (distance / speed) * 3.6;
     165      double costs = (distance / speed);
    166166      return (float)costs;
    167167    }

  • branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm.Data/OsmDataSource.cs

    r8509 r8512  
    1616      vertices = new Dictionary<long, Vertex>();
    1717
    18       ReadDataV2();
     18      ReadData();
    1919    }
    2020
Note: See TracChangeset for help on using the changeset viewer.