Commit Graph

200 Commits

Author SHA1 Message Date
DennisOSRM
26662b7190 Original Edge Data gets written to output stream with buffering 2012-04-27 16:50:34 +02:00
DennisOSRM
8fdfff3014 Chopping off another 4 Bytes per Edge in Contractor by limiting original
Edge Count to 1<<28
2012-04-27 13:45:32 +02:00
DennisOSRM
0b83310100 Reverting some externalizations 2012-04-27 13:20:56 +02:00
DennisOSRM
8c2bd8bd88 Externalized even more of the temporary data structures. 2012-04-26 14:03:01 +02:00
DennisOSRM
bb98bc92ef Moving temporary storage of edge-expanded graph to external memory 2012-04-26 11:19:45 +02:00
DennisOSRM
3c08b89923 more debug output added 2012-04-26 09:59:39 +02:00
DennisOSRM
7baef59b79 Merge remote-tracking branch 'origin/develop/GraphEdgeSeparation' into
develop/GraphEdgeSeparation

Conflicts:
	Contractor/EdgeBasedGraphFactory.cpp
2012-04-25 19:01:58 +02:00
DennisOSRM
6fe580bd75 Undoing wrong merge. Flushing some memory before generation of
edge-expanded graph
2012-04-25 18:56:42 +02:00
DennisOSRM
91d875c157 trivial code change 2012-04-25 18:36:18 +02:00
DennisOSRM
7fa409a72f moving back to vector 2012-04-25 18:32:59 +02:00
DennisOSRM
d8927ec5f8 Merge remote-tracking branch 'origin/feature/TrivialContraction' into develop/GraphEdgeSeparation 2012-04-25 18:31:23 +02:00
DennisOSRM
15751ae1a1 Moving to vector 2012-04-25 18:30:38 +02:00
DennisOSRM
bda8431d50 Moving to deque 2012-04-25 17:19:08 +02:00
DennisOSRM
d4536ba242 Experiments with deque to see if it's more allocation friendly 2012-04-25 17:12:46 +02:00
DennisOSRM
41eb07e35b Vector allocation is done in chunks of 10% increase 2012-04-25 16:35:13 +02:00
DennisOSRM
0c0049f8cc Externalized temporary storage for edge-expanded graph 2012-04-25 16:07:43 +02:00
DennisOSRM
d7c44e2bbd Minor code adjustments 2012-04-25 14:21:03 +02:00
DennisOSRM
7e47553c88 Further cleanup 2012-04-25 10:57:19 +02:00
DennisOSRM
f8761ecea0 Routing datastructure more seperated from data of original edges 2012-04-25 10:51:16 +02:00
DennisOSRM
9d6402aad4 Contract trivial degree two ways. 2012-04-20 18:34:49 +02:00
DennisOSRM
969d5c8558 Removing leftovers of STL parallel mode experiments 2012-04-14 18:01:06 +02:00
DennisOSRM
80219a31e2 Trim excess capacities 2012-04-14 15:28:45 +02:00
DennisOSRM
4401b58f45 Adding a little more verbosity during construction of external memory
data structure
2012-04-14 15:07:02 +02:00
DennisOSRM
8d2d3bd73c Swapping vector with itself in contractor to save a little space 2012-04-14 15:05:51 +02:00
DennisOSRM
e104017d4c Skipping ContractionCleantup entirely. Avoids a big allocation. Removing
DELETE() macro.
2012-04-12 19:35:47 +02:00
DennisOSRM
b9e0cb6be1 Cleaning up debug outputs 2012-04-04 13:08:13 +02:00
DennisOSRM
9ffcec2fcb Minor updates for flushing Contractor 2012-04-04 11:11:54 +02:00
DennisOSRM
964c0425bf First working implementation of Contractor flush at 75% of contracted
nodes
2012-04-04 09:55:43 +02:00
DennisOSRM
a5c5f4c02c First round of changes to have the constractor flush its data structures
at around 75% of the preprocessing. Also, a first try to branches.
2012-03-24 20:15:04 +01:00
DennisOSRM
3f6cc725d6 First round of changes for access=destination enhancements. Not yet
fully functional.
2012-03-22 10:25:04 +01:00
DennisOSRM
556e487a15 Adding a U-turn penalty for very sharp turns. Fixes #188 and #153 and
also partially fixes #65 and #167
2012-03-20 12:35:52 +01:00
DennisOSRM
3ea1461839 Fixing direction of edges. 2012-03-08 11:35:40 +01:00
DennisOSRM
164e1be018 Disabling CH postprocessing for now. 2012-03-08 11:27:31 +01:00
DennisOSRM
fffb9c8a2c Correct counting of node-based edges 2012-03-07 14:08:46 +01:00
DennisOSRM
29b30bb69c Moving contractor back to baseline 2012-03-07 08:49:10 +01:00
DennisOSRM
f8499e1113 More assertions in debug runs, but faster in release runs. 2012-03-05 14:34:38 +01:00
DennisOSRM
77d5c44664 fixes issue #161 2012-03-05 09:36:20 +01:00
DennisOSRM
9fdb6eb2c5 Refactoring edge based graph generation subrouting into a single
function. Should make parallelization much easier.
2012-03-01 19:41:06 +01:00
DennisOSRM
9673980fae Reserve is not initial size 2012-03-01 15:59:46 +01:00
DennisOSRM
63f4aaf7dd Further refactoring of edge based graph generation 2012-03-01 14:36:10 +01:00
DennisOSRM
f8c0c468a9 First preparations for Intels TBB 2012-02-29 20:02:04 +01:00
DennisOSRM
300f7370c8 traffic signal penalty gets incorporated now into routing data. 2012-02-28 16:25:01 +01:00
DennisOSRM
8d83ce47e9 Renaming vector 2012-02-28 15:33:31 +01:00
DennisOSRM
a88ad71be6 Merge branch 'master' of
https://DennisOSRM@github.com/DennisOSRM/Project-OSRM.git
2012-02-23 16:29:55 +01:00
DennisOSRM
f94ebf5296 Removing unnecessary debug output 2012-02-10 17:35:59 +01:00
DennisOSRM
8cddaf39c4 Fixes issue #105 and partially #62 as well as #83. 2012-02-10 17:14:30 +01:00
DennisOSRM
2c4621011d Additional work for issue #46 2012-02-08 18:31:37 +01:00
DennisOSRM
0dc77b056a Fixes issue #46. Turn instructions are much more verbose now where the
streets have no name.
2012-02-08 11:46:34 +01:00
DennisOSRM
5136853ce0 Fixes issue #101. Target nodes close to bollards were neglected. 2012-02-07 19:40:25 +01:00
DennisOSRM
c98f19c5a6 Adding a hop limit to preprocessing, which makes preprocessing a lot
faster but trades for routing speed.
2012-02-07 11:52:22 +01:00
DennisOSRM
d41b0f28b4 Fixes issue #94. 2012-01-31 16:12:19 +01:00
Dr Scott
7d21a4e0fb fixing some memory problems 2012-01-26 01:48:22 +01:00
DennisOSRM
664f133c4b Optimization hacks. Saving about 10% preprocessing time and about 1-2%
space
2012-01-07 15:00:40 +01:00
DennisOSRM
70256146fc barrier=bollard is now used. Fixes ticket #9 and saves about .5% RAM in
metropolitan areas
2012-01-02 13:09:20 +01:00
DennisOSRM
ee1b3afdcf Allowing U-Turn at the end of a dead-end street which is necessary for
via routes.
2012-01-01 16:04:59 +01:00
DennisOSRM
e1f137d59a Minor perfomance tweaks. Saves about 3-4 percent of preprocessing time
spent in computing the CH.
2011-12-30 15:37:19 +01:00
DennisOSRM
ebf3eea004 Output message about number of used restrictions is now more helpful. 2011-12-30 13:30:17 +01:00
DennisOSRM
f5226b2228 Certain type of edges, i.e. ferries, are now properly ignored from
nearest neighbor lookup. Fixes ticket 59.
2011-12-16 14:05:30 +01:00
DennisOSRM
a7e7773d85 Fixing premature push to master repo 2011-12-14 19:01:57 +01:00
DennisOSRM
e849d18c1b Merge fixed 2011-12-13 11:08:40 +01:00
DennisOSRM
85f9b398da Minor change: Removing dead code 2011-12-13 10:12:41 +01:00
DennisOSRM
ec3bcb43a8 Downsizing memory requirements by better struct packing 2011-12-10 18:26:33 +01:00
DennisOSRM
1fb97f0080 Disabling tc 2011-12-10 16:50:18 +01:00
DennisOSRM
79a989e504 ignored edge type, i.e. ferry connections, can now be excluded from
nearest neighbor lookup
2011-12-10 15:13:15 +01:00
DennisOSRM
045922fb56 fixes ticket 43 2011-12-05 14:45:45 +01:00
DennisOSRM
7be723782a Support for 'only_*'-typed turn restrictions. 2011-12-02 16:38:10 +01:00
DennisOSRM
21c9132902 Flushing vectors by swap tricks smoothes memory requirements 2011-12-01 15:13:35 +01:00
DennisOSRM
5236fb8c0e Removed superflous member that saves about 10 percent of RAM 2011-12-01 14:48:06 +01:00
DennisOSRM
ff5e34ee70 Fixing segfaults when restrictions list was empty. See ticket #34 2011-11-30 18:48:38 +01:00
Emil Tin
f511af0f0c fix compilation on mac; openmp issues and an unneeded typename 2011-11-26 16:42:15 +01:00
DennisOSRM
44235d427d More monav backporting 2011-11-25 17:23:23 +01:00
DennisOSRM
18b4f44605 MoNav backport, 30% faster contraction 2011-11-25 14:43:56 +01:00
DennisOSRM
8d008f9dcc Space requirements are better now 2011-11-25 12:02:52 +01:00
DennisOSRM
d32734af0b Removing unnecessary parameter and using smart instead of raw pointers 2011-11-25 12:01:52 +01:00
DennisOSRM
7585dec359 Added angle based turn costs 2011-11-24 18:51:28 +01:00
DennisOSRM
4e75bd1de6 Start and target can be on same edge 2011-11-24 17:33:23 +01:00
DennisOSRM
fb1857f7cc Exits of roundabouts get handled 2011-11-23 18:40:54 +01:00
DennisOSRM
885d45e9b8 More roundabout magic 2011-11-22 16:57:42 +01:00
DennisOSRM
070050a48e Entering and leaving roundabouts is getting handled. 2011-11-22 16:47:15 +01:00
DennisOSRM
e7439e92ed Route description are generated 2011-11-17 18:04:49 +01:00
DennisOSRM
f66c1e4a4f Removed unnecessary nameID of first leg 2011-11-16 18:10:51 +01:00
DennisOSRM
9a6cf7b991 Add first nodes with negative weights 2011-11-16 17:29:00 +01:00
DennisOSRM
caf8cd701e NNGrid supports nameID of edges. 2011-11-15 16:47:53 +01:00
DennisOSRM
eca2c0c5ef Store nameID with Edge 2011-11-15 16:24:13 +01:00
DennisOSRM
274189ee7e Removed superflous pointer in Contractor 2011-11-15 11:41:28 +01:00
DennisOSRM
18c7aa7f89 Carrying turn instructions through Contractor 2011-11-15 11:40:29 +01:00
DennisOSRM
735b4e2db1 Renamed ImportEdge turn instruction getter function to turnInstruction() 2011-11-15 11:35:46 +01:00
DennisOSRM
97afa231ca First working edge based version. Still missing: GPX export; Via Points;
origin,destination on same edge, descriptions
2011-11-14 19:36:31 +01:00
DennisOSRM
34e4ead885 Generation of edge based graph fixed. 2011-11-14 13:12:56 +01:00
DennisOSRM
afaca23f12 Backport from Monav 2011-11-14 13:12:22 +01:00
DennisOSRM
f8135c56b7 Merge branch 'master' of https://github.com/DennisOSRM/Project-OSRM 2011-11-09 16:12:12 +01:00
DennisOSRM
eb9630251f First set of changes toward edge-based graph 2011-11-09 16:12:05 +01:00
Dennis Luxen
3fcabb642e Compile fixes if OpenMP is not available 2011-11-03 10:53:40 -05:00
DennisOSRM
d7f82db8bd Removing superflous member. 2011-10-10 18:52:00 +02:00
DennisOSRM
4e2be10574 Updated dependencies 2011-10-10 17:52:47 +02:00
DennisOSRM
4e3f975221 Fixing signed/unsigned comparison 2011-10-10 15:00:08 +02:00
DennisOSRM
89e4d4ac30 Fixes issue #17 2011-10-05 18:02:26 +02:00
DennisOSRM
528d0a2899 Fixing signed to unsigned comparison warning 2011-10-04 15:32:16 +02:00
Dennis Luxen
54d8a362fc Windows support, thanks sivetic 2011-09-28 17:22:03 +02:00
Dennis Luxen
ff3de43ec6 A bit of code-cleanup. 2011-08-04 17:07:51 +00:00