Lev Dragunov
497709da13
Review fixes
2017-03-22 10:39:36 +00:00
Lev Dragunov
cce4f6344c
TODO fixes
2017-03-22 10:39:36 +00:00
Lev Dragunov
2fab696bb3
New tidying and gaps parameters.
2017-03-22 10:39:36 +00:00
Lev Dragunov
69422cc4e7
Clang formatting.
2017-03-22 10:39:36 +00:00
Lev Dragunov
e9c0987e8a
Integration #3149 and #3815
2017-03-22 10:39:36 +00:00
Daniel J. Hofmann
bd9eb76a2d
Transparently Tidy Traces in Map Matching, resolves #2840 .
...
The Map Matching plugin currently has issues with:
- high frequency traces and (performance)
- blobs, think noise at traffic signals (correctness)
This changeset implements trace-tidying transparently for the user.
We hopefully will see both performance gains as well as better matches!
2017-03-22 10:39:36 +00:00
Lev Dragunov
441eae9df2
Tidying prarameter for the map matching plugin.
2017-03-22 10:39:36 +00:00
Daniel J. Hofmann
215489286d
Back to Monaco for examples and benchmarks
2017-03-21 20:10:39 +00:00
Daniel J. Hofmann
2351b5a084
Merges node-osrm into repository
...
Build with
cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=On -DENABLE_MASON=On
2017-03-21 20:10:39 +00:00
Patrick Niklaus
655ca803d8
Adds a special graph for MLD with effcient boundary scan
...
This graph enables efficient boundary edge scans at each level.
Currenly this needs about |V|*|L| bytes of storage.
We can optimize this when the highest boundary nodes ID is << |V|.
2017-03-21 16:23:10 +00:00
Michael Krasnyk
78a199e2fb
Add read-only max_turn_weight in ProfileProperties
2017-03-20 20:06:51 +01:00
Michael Krasnyk
f1b88adebe
Avoid dynamic binding in getNodeQureyLevel
2017-03-17 13:20:34 +01:00
Michael Krasnyk
0c6ce6ce08
Implement MLD routingStep with cell restriction and without
2017-03-17 13:20:33 +01:00
Michael Krasnyk
152f77b665
Remove level field from heap node data
2017-03-17 13:20:33 +01:00
Michael Krasnyk
fe5d1a6e74
Add MLD testing to cucumber tests
2017-03-17 12:27:47 +01:00
Michael Krasnyk
c648711f30
MLD direct shortest path plugin
2017-03-17 12:27:47 +01:00
Michael Krasnyk
6829f46c31
Split routing_base into CH and non-CH parts
2017-03-17 12:27:47 +01:00
Michael Krasnyk
43a7e8e08a
Rename {id|edge_id} to turn_id
2017-03-17 12:27:47 +01:00
Patrick Niklaus
57c6c6e51c
Remove all boundary nodes and use simple u-v-stragtegy to pick id
...
This commit removes all occurences of unconnected boundary nodes
and switches to the simple heuristic of picking U for the forward
and V for the backward node. This performs better than several
fancy heuristics.
2017-03-17 11:23:48 +00:00
Patrick Niklaus
bf6698f4cc
Address @daniel-j-h PR commtents
2017-03-17 11:19:58 +00:00
Patrick Niklaus
44757729b7
Ignore --generate-edge-lookup and not list it anymore
2017-03-17 11:19:58 +00:00
Patrick Niklaus
eb2e4d0aaf
Load edge based graph to memory in one block and then update
2017-03-17 11:19:58 +00:00
Patrick Niklaus
4684a498c4
Precompute accumulated segment data
2017-03-17 11:19:58 +00:00
Patrick Niklaus
864543b023
Fix invalid warning
2017-03-17 11:19:58 +00:00
Patrick Niklaus
ed143b503d
Consolidate data loading
2017-03-17 11:19:58 +00:00
Patrick Niklaus
809d8a7d03
Remove duration fallback for turn penalties to simplify logic
2017-03-17 11:19:58 +00:00
Patrick Niklaus
5ab882759d
First step of moving turn penalty update to own function
2017-03-17 11:19:58 +00:00
Patrick Niklaus
acbaecf45d
Remove .osrm.edge_segment_update not needed anymore
2017-03-17 11:19:58 +00:00
Patrick Niklaus
1f238fedd8
Only recompute weights for segments that needs to be updated
2017-03-17 11:19:58 +00:00
Patrick Niklaus
5828f4400d
Return sorted list of updated segments and segment_data
2017-03-17 11:19:58 +00:00
Patrick Niklaus
4e2b157db3
Refactor update factor warning
2017-03-17 11:19:58 +00:00
Patrick Niklaus
8f9b4fcdbb
Don't copy query nodes
2017-03-17 11:19:58 +00:00
Patrick Niklaus
2cc22ce098
Update consistency checker
2017-03-17 11:19:58 +00:00
Patrick Niklaus
2df02aa301
Make segment data update work without rtree
2017-03-17 11:19:58 +00:00
Patrick Niklaus
cec1f223e9
Split segment data update and edge update into sub-functions
2017-03-17 11:19:58 +00:00
Patrick Niklaus
17f8339aa6
Split out segment data update function
2017-03-17 11:19:58 +00:00
Daniel J. Hofmann
35c4c2a256
Fixes use-after-move, closes #3820
2017-03-16 14:42:48 +01:00
Bhargav Chippada
3c81baa26e
Nearest Service #coordinates >=1
2017-03-15 22:42:08 +00:00
Patrick Niklaus
907f933a54
Add update functionality to osrm-customize
...
All speed file flags are compatible with osrm-contract.
2017-03-13 23:04:45 +00:00
Michael Krasnyk
c6e9cc8024
Add heuristic approach to assign edge-based partition IDs
...
that minimize number of faked source/destination nodes in
the edge case: a single backward edge will be placed
in other than node u partion
2017-03-13 22:00:38 +00:00
Patrick Niklaus
a636e8cc13
Include datasources in .geometries file and refactor .datasource_names
2017-03-10 20:40:59 +00:00
Patrick Niklaus
ffd6311e7d
Address PR comment by @oxidase
2017-03-10 14:43:02 +00:00
Patrick Niklaus
fb552fd751
Apply clang-format
2017-03-10 14:43:02 +00:00
Patrick Niklaus
94e2a8598d
Address PR comments
2017-03-10 14:43:02 +00:00
Patrick Niklaus
4986f5ea2d
Consolidate read/write code in updater for compressed geometries
2017-03-10 14:43:02 +00:00
Patrick Niklaus
1b5ab37dfd
Refactor compressed geometry in own abstraction with read/write
2017-03-10 14:43:02 +00:00
Patrick Niklaus
83820bf82c
Split CSV parsing into nicer interface
2017-03-10 14:43:02 +00:00
Patrick Niklaus
20e028c47b
Split updater code from contract into own module
2017-03-10 14:43:02 +00:00
Pepijn Schoen
c7fc36a61b
Normalize file writes
2017-03-09 14:16:41 +00:00
Mateusz Łoskot
e705ff16e3
Ensure Extractor scheduler is requested with non-Zero number of threads.
...
By default, ExtractorConfig::requested_num_threads is Zero,
which is an invalid value for tbb task scheduler.
If user does not specify value greater than Zero, then
use tbb::task_scheduler_init::automatic.
2017-03-09 12:28:19 +01:00
Michael Krasnyk
0a13390ab0
Compute correct speed values in tile plugin
2017-03-09 11:18:53 +00:00
Mateusz Łoskot
e13ba8ba11
Add basic facades for Extractor and Contractor run methods.
...
Based on idea suggested in comments to #3776 , simplifies
use of extractor and contractor as libraries.
2017-03-08 22:48:03 +00:00
Michael Krasnyk
dff8c48842
added reading cell storage in customizer
2017-03-08 16:08:00 +00:00
Michael Krasnyk
ec3cda32fa
moved basic type definitions to osrm namespace
2017-03-08 16:08:00 +00:00
Michael Krasnyk
faaf82c837
Added CellStorage statistics
2017-03-08 16:08:00 +00:00
Michael Krasnyk
3f6ae245f6
Added osrm-customizer tool
2017-03-08 16:08:00 +00:00
Michael Krasnyk
264cec12e9
Fix reading MLD data into shared memory block
2017-03-08 00:56:50 +00:00
Michael Krasnyk
e423aa5511
added TODO for #3783
2017-03-08 00:56:50 +00:00
Michael Krasnyk
6f9aea4e56
fix clang format style
2017-03-08 00:56:50 +00:00
Michael Krasnyk
d575561d39
adjust free functions naming style
2017-03-08 00:56:50 +00:00
Michael Krasnyk
f42136637d
Add edge-based graph loading in MLD facade
2017-03-08 00:56:50 +00:00
Michael Krasnyk
53b0417e36
fix boost::optional warning
2017-03-08 00:56:50 +00:00
Patrick Niklaus
821351f56e
Simplify bisection->cellid code by counting bits not depth
2017-03-08 00:56:50 +00:00
Patrick Niklaus
c8bd01caae
Use unsigned long long for 32bit
2017-03-08 00:56:50 +00:00
Patrick Niklaus
6cb401b1ff
Run clang-format
2017-03-08 00:56:50 +00:00
Patrick Niklaus
8ad9a0aa9a
parameterize cell size
2017-03-08 00:56:50 +00:00
Patrick Niklaus
8f9e980945
Add class to translate from bisection ids to cell ids
2017-03-08 00:56:50 +00:00
Patrick Niklaus
00d01946cd
Moved MultiLevelPartition and CellStorage to partition namespace
2017-03-08 00:56:50 +00:00
Patrick Niklaus
694bf9d8b1
Integrate CellStorage into datafacade
2017-03-08 00:56:50 +00:00
Patrick Niklaus
ef71cc0d12
Clang format
2017-03-08 00:56:50 +00:00
Patrick Niklaus
108fce896b
Pull everthing in the facades
2017-03-08 00:56:50 +00:00
Michael Krasnyk
ff0a98196f
Initial interation on writing out MLD partition/cell data
2017-03-08 00:56:50 +00:00
Michael Krasnyk
172b1ff9d1
Enable building osrm-extract-conditionals on travis
2017-03-06 16:16:17 +00:00
Patrick Niklaus
c2a5cc034a
Fix formating
2017-03-03 16:02:12 +00:00
Patrick Niklaus
e737700c7b
Fix tile encoding
2017-03-03 16:02:12 +00:00
Patrick Niklaus
a32f8a6a59
Fix two typos in tile code
2017-03-03 16:02:12 +00:00
Patrick Niklaus
ed00965d18
Add algorithm selection
2017-03-03 16:02:12 +00:00
Patrick Niklaus
3f485ac09b
Addressed PR comments by @daniel-j-h and @oxidase
2017-03-03 16:02:12 +00:00
Patrick Niklaus
a901bda41e
Fix algorithm compability check logic
2017-03-03 16:02:12 +00:00
Patrick Niklaus
0ac1f99f9c
Fix bug in refactor
2017-03-03 16:02:12 +00:00
Patrick Niklaus
30ff0fa977
Refactor routeStep
2017-03-03 16:02:12 +00:00
Patrick Niklaus
7da86b5984
Implement CoreCH algorithm
2017-03-03 16:02:12 +00:00
Patrick Niklaus
922e155763
Add type traits to disable plugins for specific algorithms
2017-03-03 16:02:12 +00:00
Patrick Niklaus
436b34ffea
Refactor routing_algorithms to only contain free functions
2017-03-03 16:02:12 +00:00
Patrick Niklaus
2fa8d0f534
Port OSRM, Engine and Datafacades to be algorithm aware
2017-03-03 16:02:12 +00:00
Patrick Niklaus
886421b43a
Fix help texts and .nbg_to_ebg -> .cnbg_to_ebg
2017-03-01 16:09:29 +00:00
Patrick Niklaus
e20cbf673f
Make InertialFlow a function
2017-03-01 16:09:29 +00:00
Michael Krasnyk
748ade5fea
fixed warnings
2017-03-01 16:09:29 +00:00
Michael Krasnyk
f5e9c7df07
adjust extractor scc to new StaticGraph
2017-03-01 16:09:29 +00:00
Moritz Kobitzsch
ed7438b9ba
don't check for files not actually read
2017-03-01 16:09:29 +00:00
Moritz Kobitzsch
e8cca36369
fix tbb leaks
2017-03-01 16:09:29 +00:00
Daniel J. Hofmann
c712fafae3
Sigh. Just randomly pick a side for border nodes for now..
2017-03-01 16:09:29 +00:00
Daniel J. Hofmann
e589ab814d
Store flag for artificial bounary edges and walk border nodes in ebg
2017-03-01 16:09:29 +00:00
Daniel J. Hofmann
5015e12d59
First try at artificial nodes
2017-03-01 16:09:29 +00:00
Daniel J. Hofmann
3e409bea26
Loads the edge based graph edges and constructs a dynamic graph from it
2017-03-01 16:09:29 +00:00
Daniel J. Hofmann
e0665856b0
Split Partitioner I/O off into separate headers
2017-03-01 16:09:29 +00:00
Daniel J. Hofmann
f71d742b5e
Implements Mapping for NodeBasedGraph -> EdgeBasedgraph Translation
2017-03-01 16:09:29 +00:00
Daniel J. Hofmann
299d071e9d
Fixes asan's detected tbb leak in osrm-partition
...
Here's all I could get out of a instrumented `osrm-partition`; debug build,
with all the bells and whistles I could think of to make it more verbose:
```
==17928==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 1560 byte(s) in 3 object(s) allocated from:
#0 0x7f4244185b30 in operator new[](unsigned long) ../../../../libsanitizer/asan/asan_new_delete.cc:62
#1 0x7f4242a788b3 (/usr/lib/libtbb.so.2+0x208b3)
SUMMARY: AddressSanitizer: 1560 byte(s) leaked in 3 allocation(s).<Paste>
``
Symbolizing the address results in
```
echo "/usr/lib/libtbb.so 0x7f4242a788b3" | llvm-symbolizer
_fini
```
Looks like a crt finalizer => static global dtor "leaking" from tbb.
Which turned out to be a missing `tbb::task_scheduler_init` on our end:
> Using task_scheduler_init is optional in Intel® Threading Building
> Blocks (Intel® TBB) 2.2. By default, Intel TBB 2.2 automatically creates
> a task scheduler the first time that a thread uses task scheduling
> services and destroys it when the last such thread exits.
https://www.threadingbuildingblocks.org/docs/help/hh_goto.htm?index.htm#reference/task_scheduler/task_scheduler_init_cls.html
Without an explicit instanz the first call to a tbb algorithm seem to initialize
a global scheduler singleton which then "leaks" until the program exits.
Phew.
2017-03-01 16:09:29 +00:00
Moritz Kobitzsch
be41e8b321
generate stats in annotation
2017-03-01 16:09:29 +00:00
Daniel Patterson
b62b09e5f6
Dump memory usage stats after partitioning.
2017-03-01 16:09:29 +00:00