Commit Graph

249 Commits

Author SHA1 Message Date
Patrick Niklaus
f90ce77da4 Use differential encoding for name offsets
Each name is represented as an integer range in a vector of chars.
Instead of storing the absolute offset inside this array, we can store
only the offset to the previous entry (the string size). By doing this we reduce
the number of bytes need to store an offset from 4 to 1 bytes (if we
set a maximum string length of 255).
This is however slower, since the absolute offset must be computed on
each querry by summing up all previous lengths. To limit the
performance inpact we only do this for blocks of a certain size (16).
2014-06-12 22:00:03 +02:00
Alexei Kasatkin
75303c95f8 Avoid constexpr by #ifdef (not supported in MSVC18) 2014-06-11 18:15:16 +06:00
Dennis Luxen
2ad572490c const as const can 2014-06-06 18:06:05 +02:00
Dennis Luxen
0ed9caf969 fix a couple of implicit signed/unsigned conversions 2014-06-06 18:05:07 +02:00
Dennis Luxen
e13ee59af3 remove some code lint 2014-06-05 15:14:39 +02:00
Dennis Luxen
1163417722 Merge branch 'patch-timing' of https://github.com/alex85k/Project-OSRM into alex85k-patch-timing
Conflicts:
	extractor.cpp
2014-06-05 11:22:26 +02:00
alex85k
7335e0809a Globally rename UUID to FingerPrint 2014-06-05 10:31:19 +02:00
alex85k
75dabb75e2 Use TimingUtil.h for all time measurement,
and make TimingUtil.h Windows-compatible
2014-06-04 19:52:34 +06:00
Dennis Luxen
8fda5a187b rename variable to a shorter name 2014-06-03 10:44:09 +02:00
Dennis Luxen
7b78270f4b safe-guard against broken input data 2014-06-02 19:23:50 +02:00
Dennis Luxen
afd3599a9c remove depth of nested block 2014-06-02 18:18:27 +02:00
Dennis Luxen
7dac8c621c fix a couple of OCLint warning, i.e. short variable names and useless parantheses 2014-05-30 10:01:55 +02:00
Dennis Luxen
7f2daf8926 some variables renamed to replace camel case 2014-05-26 16:02:15 +02:00
Dennis Luxen
984457f9c6 remove useless parantheses, straighten includes 2014-05-26 12:49:49 +02:00
Dennis Luxen
6a03f13d55 fixes #1032:
- remove left-overs from OpenMP
- replace omp_* calls with TBB equivalents
2014-05-22 18:39:11 +02:00
Patrick Niklaus
da1fd96d4e Port extractor to TBB 2014-05-21 21:49:22 +02:00
Dennis Luxen
75a2d4d00a minor code refactoring, wip 2014-05-20 14:33:02 +02:00
Dennis Luxen
9a28bdbf76 reorder some includes 2014-05-14 08:53:26 +02:00
Dennis Luxen
981941edf4 leave early to reduce scope nesting 2014-05-13 12:22:42 +02:00
Dennis Luxen
8b8e08f0f5 use less than 4GB on 32 bits. fixes #1008 2014-05-12 10:57:02 +02:00
Dennis Luxen
633ef26054 fix compile warning 2014-05-09 19:42:15 +02:00
Dennis Luxen
285bd4f542 further climits madness 2014-05-09 19:41:36 +02:00
Dennis Luxen
e706fb973f build fixes on GCC 2014-05-09 19:35:09 +02:00
Dennis Luxen
8dc7afed4e remove even more climits 2014-05-09 19:26:37 +02:00
Dennis Luxen
0c7f996de6 use std numeric limits instead of climits 2014-05-09 19:22:38 +02:00
Dennis Luxen
5e26e4c22d replacing all boost unordereds 2014-05-09 18:40:07 +02:00
Dennis Luxen
0fccd0f0d2 refactor Extractor/ 2014-05-09 16:17:31 +02:00
Dennis Luxen
afc0bac232 remove boost/noncopyable, fwd decl 2014-05-09 14:08:56 +02:00
Dennis Luxen
3cb34f8036 remove debug output 2014-05-09 11:23:56 +02:00
Dennis Luxen
abe9c4d53c use nullptr instead of NULL 2014-05-08 16:39:17 +02:00
Dennis Luxen
9710f39cad remove (almost) all BOOST_FOREACH calls 2014-05-07 16:17:47 +02:00
Dennis Luxen
bf9d9512a0 fix typo 2014-05-07 14:24:04 +02:00
Dennis Luxen
ea12c6fde6 untangle includes a bit 2014-05-07 14:11:59 +02:00
Dennis Luxen
c2b7336817 reformat MachineInfo.h 2014-05-07 11:38:22 +02:00
Dennis Luxen
fb17653651 add chrono in more places 2014-05-07 10:39:35 +02:00
Dennis Luxen
c1e7ba7118 replace all timing by C++11's chrono 2014-05-07 10:39:34 +02:00
Patrick Niklaus
56f6c795ed Fix typos 2014-05-07 10:38:29 +02:00
Dennis Luxen
a1ecab2f95 refactor xml parser, uses faster string to double conversion 2014-04-29 16:05:34 +02:00
Dennis Luxen
d0b4ffd154 fix openmp woes on linux 2014-04-28 18:23:56 +02:00
Dennis Luxen
265af1f790 minor refactoring 2014-04-28 17:27:15 +02:00
Dennis Luxen
b429d9f509 remove unreachable code 2014-04-24 12:55:52 +02:00
Dennis Luxen
2a64297506 Forward decl to cut compile times 2014-04-24 12:51:17 +02:00
Dennis Luxen
f7d5b0db9c uncompressed edges get serialized correctly'ish 2014-04-24 12:05:43 +02:00
Dennis Luxen
d0349d9b0d further copy edits 2014-04-24 12:05:42 +02:00
Dennis Luxen
64720c2d2e several lints fixed that were detected by facebook's flint 2014-04-21 17:40:07 +02:00
Emil Tin
775627473a remove .osm deprecation warning 2014-03-31 16:55:39 +02:00
Dennis Luxen
ad03b409ab make variable names more telling 2014-03-17 14:42:24 +01:00
Dennis Luxen
38ae213260 make variable names more telling 2014-03-17 14:40:10 +01:00
Dennis Luxen
6a0a59896e make variable names more telling 2014-03-17 14:39:24 +01:00
Dennis Luxen
187cb56364 split long line in two 2014-03-17 14:37:33 +01:00
Dennis Luxen
1fe96d0d22 remove collapsable if statement 2014-03-17 14:36:34 +01:00
Dennis Luxen
b5b4280c3b remove c-style calls to fabs 2014-01-27 11:26:34 +01:00
Dennis Luxen
046fe93f1f refactor ExtractorStructs.h for faster compiles. achieves approx. 10 secs 2014-01-09 16:13:35 +01:00
Dennis Luxen
dbe70ffc8a save 4 bytes per internal edge 2014-01-08 17:11:31 +01:00
Dennis Luxen
8b3c8f7093 refactoring variable names and layout to be more readable 2013-12-23 17:55:29 +01:00
DennisOSRM
41f3f53540 move includes to include/osrm 2013-12-20 13:12:56 +01:00
Dennis Luxen
fd2f000075 install lib header files with make install target 2013-12-17 17:59:44 +01:00
Dennis Luxen
8c4c1a56fd reduce compile time by using fwd decls 2013-12-16 11:29:38 +01:00
Dennis Luxen
b030fe7db2 break out Coordinate in compile unit 2013-12-13 17:26:57 -05:00
Dennis Luxen
1e09935501 make counters available in release and debug build, take2 2013-12-09 09:17:38 -05:00
Dennis Luxen
d7e558350b make counters available in release and debug build 2013-12-09 09:04:44 -05:00
Dennis Luxen
015b29e8a3 remove superflous ifdef 2013-12-08 19:12:01 +01:00
Dennis Luxen
30b2c1ad61 refactor input restrictions class 2013-11-13 15:23:44 -05:00
Dennis Luxen
5e279363e4 sort data externally with 4GB of RAM 2013-11-13 11:09:20 -05:00
Dennis Luxen
510cc22484 Refactor name of legacy class _Node into more telling name ExternalMemoryNode 2013-11-12 18:23:09 -05:00
Dennis Luxen
7e35a7fe0c remove deprecated stxxl calls to be ready for the 1.4.0 release 2013-11-12 17:33:03 -05:00
Dennis Luxen
4ec79d61d0 Merge branch 'shared_memory' into develop 2013-10-30 15:10:07 +01:00
Emil Tin
13c9e1ed58 allowing read-only access to osm way/node id from lua 2013-10-18 12:31:08 +02:00
Dennis Luxen
0ba12f48c6 state type of template class member function explicitly 2013-10-15 14:35:35 +02:00
Dennis Luxen
f77a699ea4 remove problematic luabind code 2013-10-15 14:35:35 +02:00
Dennis Luxen
b87a98bbda street name file is now more canonical 2013-10-15 14:32:43 +02:00
Dennis Luxen
29499f21c5 License change to (simplified) 2-clause BSD. Good riddance, AGPL 2013-10-14 13:42:28 +02:00
Dennis Luxen
bf8505a285 removing all FLT_EPSILONs 2013-10-02 13:05:54 +02:00
Dennis Luxen
fb9822b507 street name list is now a char array /w indices array 2013-08-20 17:05:36 +02:00
Dennis Luxen
da98900e3a fixing regression in osrm-components 2013-08-19 13:42:34 +02:00
Dennis Luxen
d24ba6d13d Mild perfomance fixed for PBF extraction 2013-08-16 17:09:27 +02:00
Dennis Luxen
4748bca8a4 Refactoring _Coordinate class 2013-08-14 13:12:28 +02:00
Dennis Luxen
916387748c Refactor _Restriction class 2013-08-14 11:59:46 +02:00
Dennis Luxen
7ee4692e84 properly order includes 2013-08-11 23:01:15 +02:00
Dennis Luxen
d7673dad7b fixing release build 2013-08-08 14:39:51 +02:00
Dennis Luxen
ef221e1c6c Replacing log macros by more sophisticated mechanism 2013-08-08 14:17:01 +02:00
Dennis Luxen
e06fe6935a refactor Hashtable 2013-08-06 16:39:04 +02:00
Dennis Luxen
e5f0ad4f0b Use boost timer to provide platform independent timing 2013-08-06 14:27:36 +02:00
Dennis Luxen
13f5baf608 Moving node data structure into more meaningful class name 2013-08-05 19:35:47 +02:00
Dennis Luxen
23899613c3 Implement #495 2013-08-05 18:37:42 +02:00
Dennis Luxen
54302a53e1 use exceptions instead of hard abort 2013-08-05 17:28:57 +02:00
DennisOSRM
4a39a4af1c Check for valid data files. Implements #224 2013-07-22 16:34:06 +02:00
DennisOSRM
1ca213cec6 Remove duplicate license header 2013-07-17 16:27:50 +02:00
DennisOSRM
f5124de327 Partially fixes #646. Values were incorrectly casted to int32_t and not uint32_t 2013-07-09 14:25:32 +02:00
Dennis Luxen
74729a372b some refactoring 2013-06-26 20:05:03 -04:00
Dennis Luxen
2c397bfa0b First implementation of moving the algorithmic core into a library 2013-06-26 19:48:02 -04:00
Dennis Luxen
9d6bd91279 some optimization to speed up pbf parsing 2013-06-26 13:39:45 -04:00
Dennis Luxen
2b8b876713 Reorder include block according to style guide 2013-06-26 09:43:13 -04:00
Dennis Luxen
df30498365 counting generated edges correctly 2013-06-24 16:39:35 -04:00
DennisOSRM
46c3ce0e34 Fixing 32 bit node id issue 2013-03-08 11:06:14 +01:00
DennisOSRM
53af4ee39f Cleaning of several regressions in the parsing code. 2013-02-27 17:36:44 +01:00
Emil Tin
3c8dd85966 respect use_restricions in xml import 2013-02-23 13:53:06 +01:00
DennisOSRM
ae8e51074e Removing superflous inline statements 2013-02-22 15:49:44 +01:00
Emil Tin
db148741e9 code cleanup 2013-02-22 15:49:43 +01:00
Emil Tin
1ecad20a0d support xml, move duplicated xml/pbf code to base 2013-02-22 15:49:43 +01:00
Emil Tin
22c5c539c2 default to using turn restrictions 2013-02-22 15:49:43 +01:00
Emil Tin
d59e526e1e lua setting for using turn restrictions 2013-02-22 15:49:43 +01:00
DennisOSRM
3d1a85bbea Fixing compilation issues on various compilers, i.e. old GCC, clang,
ICPC
2013-02-10 18:18:39 +01:00
DennisOSRM
348e656671 Merge branch 'feature/opposite_direction' into develop 2013-02-04 18:38:15 +01:00
DennisOSRM
26729ca482 Fixing useless comparison 2013-02-03 14:57:40 +01:00
DennisOSRM
bcf4af4a2f Duration tag now handles 'hh:mm', 'mm' as well as 'hh:mm:ss' 2013-01-29 10:11:04 +01:00
DennisOSRM
03de87c213 Parsing duration when present 2013-01-27 23:06:23 +01:00
DennisOSRM
59481dd762 Adding duration member to way 2013-01-27 23:05:27 +01:00
DennisOSRM
f7c6b9a0f7 Fixed direction flag on split edges 2013-01-27 14:36:57 +01:00
DennisOSRM
e6e5626a2c Implementing logic when route is going against one-way flow (think
bikes!)
2013-01-27 14:36:56 +01:00
DennisOSRM
b069725df0 Support for backward speed in extractor 2013-01-27 14:36:56 +01:00
DennisOSRM
f7d79209dc Fixing dereference after null check (Coverity: CID 967038) 2013-01-11 20:20:22 +01:00
DennisOSRM
8158e7f1c5 Using explicit 64bit integer instead of compiler-dependent long long 2013-01-11 18:16:08 +01:00
DennisOSRM
2b5e110719 Splitting utility header with ambigious name into two files with better
names
2013-01-06 19:03:04 +01:00
DennisOSRM
00168cb12f Removing dead code. 2013-01-05 22:47:12 +01:00
DennisOSRM
ffdaa71086 Implementation of turn restriction exceptions 2013-01-05 19:20:25 +01:00
Project OSRM
d2458f3169 Merge pull request #550 from ibikecph/lua_require
easy lua require()
2013-01-05 03:03:13 -08:00
Dennis Luxen
80add9f820 Splitting monolithic extraction code into compile units 2013-01-02 00:33:39 +01:00
Dennis Luxen
9379d2462e Splitting monolithic extraction code into compile units 2013-01-02 00:32:34 +01:00
Emil Tin
4aa7ade32c ordering includes alphabetically 2013-01-01 23:20:16 +01:00
DennisOSRM
8fc8a4e303 Removing last remaining 'using namespace std' statement 2012-12-29 21:02:26 +01:00
DennisOSRM
943c15927a Fixing data type issue that prevented large files on windows. See issue
#55
2012-12-29 14:14:01 +01:00
Emil Tin
28f0782b17 code cleanup, merge Lua.h and LuaUtil.h 2012-12-28 22:40:00 +01:00
Emil Tin
ce43b09991 support lua require() 2012-12-28 22:40:00 +01:00
Dennis Luxen
18aff1ae40 Remove superflous include 2012-12-11 23:23:17 +01:00
DennisOSRM
7379c8c387 Giving name of script; fix signed/unsigned comparison 2012-11-22 19:26:06 +01:00
DennisOSRM
870ed96c24 Replacing atoi by boost::spirit::qi 2012-11-20 12:15:40 +01:00
DennisOSRM
94657a3258 Implements a shared-memory parallel LUA scripting engine using OpenMP.
See issue #506
2012-11-19 19:04:59 +01:00
DennisOSRM
c4be1d1423 Fixes issue #504 2012-11-19 11:52:34 +01:00
DennisOSRM
6f8148950e Speeding up parsing of car profile by about 30% 2012-11-12 17:00:36 +01:00
Dennis Luxen
90b07cc6b0 Further refactorings 2012-11-12 10:59:23 +01:00
Dennis Luxen
ac15c787cc Further refactorings 2012-11-12 10:59:13 +01:00
DennisOSRM
55e58375eb Moving more functions into LUA 2012-11-03 08:18:39 +01:00
DennisOSRM
24321d860c Moving more functions into LUA 2012-11-03 08:18:22 +01:00
DennisOSRM
e8c7f7b5da Restructured calling of callback functions 2012-11-02 17:15:51 +01:00
DennisOSRM
2185bb3327 Parsing duration of ferries before further computation 2012-09-28 09:28:57 +02:00
DennisOSRM
bd6f2db1d1 Ignore nodes with latitude values outside of mercartor projection 2012-09-27 14:10:25 +02:00
DennisOSRM
44b625520b Fixing warning detected by additional compiler flags 2012-09-19 14:17:14 +02:00
DennisOSRM
ac588911ba Fixing warning detected by additional compiler flags 2012-09-19 13:48:04 +02:00
DennisOSRM
e3062cf3a2 Removing unused parameters, fixing signed-unsigned comparisons 2012-09-19 13:28:37 +02:00
DennisOSRM
7bd4e213c2 Fixes issue #392 2012-08-31 09:46:23 +02:00
DennisOSRM
3edf4799d3 Fixes plain old XML parsing. 2012-08-31 09:40:17 +02:00
DennisOSRM
91080f0690 Further code cleanup 2012-08-30 17:34:06 +02:00
DennisOSRM
4c2c1f519c Minor code cleanup 2012-08-30 17:01:54 +02:00
DennisOSRM
e43d27e86d Implements way parsing through LUA scripting engine, implements issue #1 2012-08-30 16:59:41 +02:00
DennisOSRM
87df312a9d Removing Adress data type that is not needed during extraction 2012-08-29 18:43:08 +02:00
DennisOSRM
1412c5db42 Removal of v8 as it sucked big time during integration and first
(partially) working parsing with LUA as the scripting engine.
2012-08-29 18:33:18 +02:00
DennisOSRM
4c58674393 First steps towards integrating libv8 2012-08-28 11:50:23 +02:00
DennisOSRM
1fdfac4aaf Refactoring extraction stuff 2012-08-27 17:40:59 +02:00