Commit Graph

244 Commits

Author SHA1 Message Date
Dennis Luxen
cc0bbc42a2 add duration to backward speed, fixes #1192 2014-09-29 11:37:36 +02:00
Emil Tin
774e6346e7 more robust check for parsed ways 2014-08-20 17:10:40 +02:00
Emil Tin
bcd55626ef make accessors const, add comments 2014-08-20 11:37:47 +02:00
Emil Tin
2e3d33dfcd remove type from more structs, remove asserts 2014-08-20 11:08:59 +02:00
Emil Tin
1e40cd6f0b remove type assertion 2014-08-20 11:08:59 +02:00
Emil Tin
60d80cf261 code style fixes 2014-08-20 11:08:59 +02:00
Emil Tin
fccb1aad32 remove type attribute 2014-08-20 11:08:59 +02:00
Emil Tin
30362cfc0c update lua interface to speed and mode 2014-08-20 11:08:58 +02:00
Emil Tin
6cdc590db5 typedef instead of enum for TravelMode to avoid gcc warnings 2014-08-20 11:08:58 +02:00
Emil Tin
6e364ff0ba rename travel mode None to Inaccessible 2014-08-20 11:08:58 +02:00
Emil Tin
6f6aff7493 remove direction field from ExtractionWay 2014-08-20 11:08:58 +02:00
Emil Tin
207cddd50b use enum for TravelMode 2014-08-20 11:08:58 +02:00
Emil Tin
3460bd0ba9 fix problems with mode, 1 failing test left 2014-08-20 11:08:42 +02:00
Emil Tin
8ea88468f3 remove unneeded methods 2014-08-20 11:08:42 +02:00
Emil Tin
235a52032a more tests passing 2014-08-20 11:08:42 +02:00
Emil Tin
a5ee7e78f6 fixes 2014-08-20 11:08:41 +02:00
Emil Tin
dae9c9a7ed use 4 bits for travel mode 2014-08-20 11:08:41 +02:00
Emil Tin
6d6d299ea4 most tests passing 2014-08-20 11:08:41 +02:00
Emil Tin
6fd615b9cd first cut at porting travel mode, some tests fail 2014-08-20 11:08:41 +02:00
Emil Tin
3e6f27d173 rename contra_flow to travel_mode, use unsigned char 2014-08-20 11:08:41 +02:00
Dennis Luxen
82c2ae5441 first round of replacing deprecated typedefs with much nicer using statements 2014-08-19 13:01:38 +02:00
Dennis Luxen
c63218a889 add final/override keyword where possible to help compiler de-virtualize function calls 2014-08-18 10:19:33 +02:00
Dennis Luxen
426374ff8a register all classes at once in LUA environment 2014-07-24 18:26:40 +02:00
Dennis Luxen
2656acc321 produce stack trace if script fails during setup. partially implements #1128 2014-07-21 15:46:19 +02:00
Dennis Luxen
e46c9be79f dont fail if script does not define member 2014-07-21 15:44:57 +02:00
Dennis Luxen
218c810860 rename variable in XMLParser to make sure its name reflects the actual content 2014-07-11 14:03:38 +02:00
Dennis Luxen
0061b3fcbf remove unneeded member in Extractor, move to function scope 2014-07-11 10:10:50 +02:00
Dennis Luxen
1f6f44ab01 include untangling of Extractor 2014-07-10 14:45:59 +02:00
dmbreaker
3a6af3810f One more blank line. 2014-07-03 10:23:43 +04:00
dmbreaker
3973554f07 Added blank lines between includes. 2014-07-03 10:23:43 +04:00
dmbreaker
718cba2e36 Trying to fix win-build 2014-07-03 10:23:43 +04:00
dmbreaker
d2a70d1504 Removed pragma, reorganized includes. 2014-07-03 10:23:43 +04:00
dmbreaker
4bc847ac42 extractor.cpp refactored a bit 2014-07-03 10:23:43 +04:00
Dennis Luxen
de7c56c6bc remove remaining NULL pointers by nullptrs 2014-06-24 16:50:00 +02:00
Dennis Luxen
dd7d6df4c6 streamline PBF parsing code 2014-06-24 12:25:19 +02:00
Dennis Luxen
b06a73e893 replace hashmap with a dummy vector based implementation as the number of tags per object is tiny 2014-06-23 13:21:56 +02:00
Dennis Luxen
f99f194927 use proper interface of HashTable, use prefix increment 2014-06-23 12:13:01 +02:00
Dennis Luxen
eac7d07ef6 rename variables to cut OCLint warnings 2014-06-23 12:11:56 +02:00
Dennis Luxen
96f834fb81 use explicit casts 2014-06-17 15:47:59 +02:00
Dennis Luxen
0e1f6f50ea Merge branch 'thread-control' of https://github.com/TheMarex/Project-OSRM into TheMarex-thread-control 2014-06-15 12:35:15 +02:00
Patrick Niklaus
c009dce591 Another VC2013 fix 2014-06-15 11:42:59 +02:00
Patrick Niklaus
40e2d7932b Fix VC2013 issues 2014-06-15 11:29:36 +02:00
Patrick Niklaus
a3e9cbc000 Allow user to force thread number
This allows the user to do (potentially) stupid things, but warns him.
The default is TBBs default, so probably the right thing.
To enforce thread numbers in extractor it must be passed to the child
threads.
2014-06-14 17:02:43 +02:00
Patrick Niklaus
807f1d7c1c Initial support for SharedDataFacade
SharedDataLayout was refactored to include canary values at the
boundaries of each memory block. This makes it easy to detect overruns
and block-size mismatches between osrm-datastore and the
SharedDataFacade.
2014-06-12 22:01:22 +02:00
Patrick Niklaus
7a7d0c09d9 Integrate RangeTable into server 2014-06-12 22:00:03 +02:00
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