Commit Graph

662 Commits

Author SHA1 Message Date
Dennis Luxen
e989e38cc2 further compile fixes for clang 3.3 (OS X 10.9) 2013-10-15 14:35:35 +02:00
Dennis Luxen
2641408d53 fail gracefully when lock file is not present 2013-10-15 14:35:34 +02:00
Dennis Luxen
5b79226183 add static function to remove shared memory 2013-10-15 14:35:34 +02:00
Dennis Luxen
98f9f0cd48 make shmem swappable by ref and ptr 2013-10-15 14:35:34 +02:00
Dennis Luxen
cf7e107ad1 check if shmem segment exists 2013-10-15 14:35:34 +02:00
Dennis Luxen
2221a0a908 removing extra ; 2013-10-15 14:32:44 +02:00
Dennis Luxen
79e1c87a01 swapping correct vectors 2013-10-15 14:32:44 +02:00
Dennis Luxen
b87a98bbda street name file is now more canonical 2013-10-15 14:32:43 +02:00
Dennis Luxen
f25bab9555 create lock file if it does not exist 2013-10-15 14:32:42 +02:00
Dennis Luxen
ba4290340d removing debug output and calling it a day 2013-10-15 14:32:41 +02:00
Dennis Luxen
5a04700bae create sentinel to adjancency array during preprocessing 2013-10-15 14:32:41 +02:00
Dennis Luxen
37e8ab8de1 implement operator()+ for shared memory iterator 2013-10-15 14:32:40 +02:00
Dennis Luxen
bbf03e3060 Load r-tree search data structure from shared memory 2013-10-15 14:32:40 +02:00
Dennis Luxen
687e58e9d4 removing dead code 2013-10-15 14:32:39 +02:00
Dennis Luxen
c8025bf004 moving fwd decl of static members to root of include graph 2013-10-15 14:31:32 +02:00
Dennis Luxen
2dd2d3dd7b adjust facade to pass compilation 2013-10-15 14:31:32 +02:00
Dennis Luxen
37e3ead8e9 use flexible shared mem interfaces 2013-10-15 14:31:31 +02:00
Dennis Luxen
a09d150b47 Further stl interface implementation 2013-10-15 14:31:31 +02:00
Dennis Luxen
35dffe43d9 further implementation of the vector interface for shared memory 2013-10-15 14:31:30 +02:00
Dennis Luxen
19c26f0733 removing old data facade, good riddance 2013-10-15 14:31:30 +02:00
Dennis Luxen
1b3e924450 added auxiliary Empty() function 2013-10-15 14:19:54 +02:00
DennisOSRM
a33e08e299 superflous typedef changed meaning of name for GCC 2013-10-15 14:19:53 +02:00
Dennis Luxen
7951795ea4 Implementation of internal data storage 2013-10-15 14:19:53 +02:00
Dennis Luxen
fb1361b00d Reworking data access to go always through facades 2013-10-15 14:19:52 +02:00
Dennis Luxen
7d52c82c3b Moving DataStructures to new data facade pattern 2013-10-15 14:14:54 +02:00
Dennis Luxen
a9ac0ac725 Mockups for data facades 2013-10-15 14:12:30 +02:00
Dennis Luxen
b51d3da7e5 Mockups for data facades 2013-10-15 14:04:11 +02:00
Dennis Luxen
12bb4d75fd Adding shared memory data types 2013-10-15 13:45:45 +02:00
Dennis Luxen
411d8d4d98 fix iterator concept implementation 2013-10-15 12:00:20 +02:00
Dennis Luxen
748df0b21a fix iterator concept implementation 2013-10-15 11:56:27 +02:00
Dennis Luxen
29499f21c5 License change to (simplified) 2-clause BSD. Good riddance, AGPL 2013-10-14 13:42:28 +02:00
DennisOSRM
18d8968ae7 add C include for NULL 2013-10-13 17:55:50 +02:00
DennisOSRM
dee7c339b3 Move edge-based node out ouf surrounding class 2013-10-11 16:14:59 +02:00
DennisOSRM
411bcbcbde remove debug output 2013-10-11 14:55:34 +02:00
Dennis Luxen
75f77783ff further compile fixes for clang 3.3 (OS X 10.9) 2013-10-09 18:58:37 +02:00
Dennis Luxen
a7449c913c fail gracefully when lock file is not present 2013-10-08 16:25:02 +02:00
Dennis Luxen
aaec0e641b add static function to remove shared memory 2013-10-08 15:47:43 +02:00
Dennis Luxen
5afed2d396 make shmem swappable by ref and ptr 2013-10-08 15:26:19 +02:00
Dennis Luxen
843348338a check if shmem segment exists 2013-10-08 14:40:49 +02:00
Dennis Luxen
d3804d2c2c replacing hard coded values by literal 2013-10-02 14:39:52 +02:00
Dennis Luxen
bf8505a285 removing all FLT_EPSILONs 2013-10-02 13:05:54 +02:00
Dennis Luxen
770a07cc28 replacing all occurrences of DBL_MAX 2013-10-02 12:00:25 +02:00
Dennis Luxen
52f6e149ec removing debug output 2013-10-02 11:40:05 +02:00
Dennis Luxen
6893df9103 replacing c-style numeric limits with proper C++ style 2013-10-02 11:38:09 +02:00
Dennis Luxen
2b077d140f Fixing #726, rounding woes and machine epsilon 2013-10-02 11:22:42 +02:00
Dennis Luxen
08d861e87c removing extra ; 2013-09-30 16:01:51 +02:00
Dennis Luxen
ed7b478ee0 swapping correct vectors 2013-09-30 15:50:26 +02:00
Dennis Luxen
333aba8be6 street name file is now more canonical 2013-09-26 18:19:51 +02:00
Dennis Luxen
043c8be747 create lock file if it does not exist 2013-09-26 11:28:51 +02:00
Dennis Luxen
f57e4c6c14 removing debug output and calling it a day 2013-09-24 18:59:44 +02:00
Dennis Luxen
14bd1d01f2 create sentinel to adjancency array during preprocessing 2013-09-24 18:48:02 +02:00
Dennis Luxen
581c9c570b implement operator()+ for shared memory iterator 2013-09-24 15:10:06 +02:00
Dennis Luxen
bf3cd37b49 Load r-tree search data structure from shared memory 2013-09-24 12:07:34 +02:00
Dennis Luxen
96cc44e521 Compile fixes on RHEL5/Fedora, see #541 2013-09-24 10:33:29 +02:00
Dennis Luxen
f2d9e4b2df removing dead code 2013-09-24 10:16:57 +02:00
Dennis Luxen
0977cabc79 moving fwd decl of static members to root of include graph 2013-09-24 09:55:02 +02:00
Dennis Luxen
6f71092aa4 adjust facade to pass compilation 2013-09-23 19:00:08 +02:00
Dennis Luxen
8521b5501f use flexible shared mem interfaces 2013-09-23 18:03:07 +02:00
Dennis Luxen
cce5d775de Further stl interface implementation 2013-09-23 18:01:30 +02:00
Dennis Luxen
973d115edf further implementation of the vector interface for shared memory 2013-09-23 13:30:21 +02:00
Dennis Luxen
aaa9f89550 removing old data facade, good riddance 2013-09-23 11:35:33 +02:00
Dennis Luxen
4520e04d37 added auxiliary Empty() function 2013-09-21 21:51:07 +02:00
DennisOSRM
5679b5862f superflous typedef changed meaning of name for GCC 2013-09-20 21:40:27 +02:00
Dennis Luxen
b343a17b29 Implementation of internal data storage 2013-09-20 18:30:47 +02:00
Dennis Luxen
0cabc81693 Reworking data access to go always through facades 2013-09-20 11:09:07 +02:00
Dennis Luxen
01d2d91ecc Moving DataStructures to new data facade pattern 2013-09-19 18:52:42 +02:00
Dennis Luxen
2ab04e7e2f Mockups for data facades 2013-09-19 12:00:36 +02:00
Dennis Luxen
a48aef4039 Adding shared memory data types 2013-09-19 12:00:35 +02:00
DennisOSRM
a6c52fd154 Fixes coordinate conversion issue. Thx @kkaefer 2013-08-27 14:15:23 +02:00
DennisOSRM
6f3e7f9e56 Fixes #721 2013-08-26 14:16:34 +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
aba078a9d8 Refactoring internal style of ConcurrentQueue 2013-08-16 17:09:04 +02:00
Dennis Luxen
161487d6c2 Refactoring members of NodeInformationHelpDesk 2013-08-16 14:06:04 +02:00
Dennis Luxen
d851dd7196 bit packing ImportEdge members 2013-08-16 13:34:28 +02:00
Dennis Luxen
0a0bed7ae0 Refactoring graph factory 2013-08-14 18:43:01 +02:00
Dennis Luxen
06c8656b9e Moving DataStructures out of Plugin directory 2013-08-14 13:41:23 +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
5f4f631fc5 Remove dead code 2013-08-13 18:35:54 +02:00
Dennis Luxen
dc6fda03a1 move const value to left-hand side of comparison 2013-08-13 18:35:22 +02:00
Dennis Luxen
c3e6dc69bb implements 0765ebf735 (commitcomment-3828005) 2013-08-09 21:33:30 +02:00
Dennis Luxen
a542292ce2 Check if files exist and contain data, fixes #693 2013-08-09 17:47:11 +02:00
Dennis Luxen
0765ebf735 Implements #692 2013-08-09 14:47:09 +02:00
Dennis Luxen
e86e8c37a8 const'ing parameters 2013-08-09 13:49:30 +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
e7cec83a4c Use boost timer to provide platform independent timing 2013-08-06 14:28:03 +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
0367399c89 Partial refactoring 2013-07-22 16:32:19 +02:00
DennisOSRM
d8c97da087 Remove dead code and reformat 2013-07-08 14:51:55 +02:00
DennisOSRM
bf62147802 Fixing unneeded explicit conversion 2013-07-08 10:27:41 +02:00
Dennis Luxen
de947d8b17 Add forgotten include 2013-06-28 10:23:58 -04:00
Dennis Luxen
29e363e7fb some refactoring 2013-06-27 16:09:21 -04:00
Dennis Luxen
a0e9f59e04 Adding a simple example on how to call the lib 2013-06-27 13:21:33 -04:00
Dennis Luxen
c940c2722e Fixing errors from static analysis 2013-06-27 11:44:55 -04:00
Dennis Luxen
1bcacfab74 minor code massage 2013-06-27 10:57:40 -04:00
Dennis Luxen
1f5f8a76fb Removing files that are not used anymore 2013-06-27 09:54:58 -04:00
Dennis Luxen
cfa8b1f0dd Moving coordinate auxiliary functions into the appropriate place 2013-06-27 09:45:28 -04:00
Dennis Luxen
63d8abe32f First implementation of moving the algorithmic core into a library 2013-06-26 19:48:22 -04:00
Dennis Luxen
ae20bac3c5 disabling debug output 2013-06-26 14:08:39 -04:00
Dennis Luxen
ecb4a08655 const'ing several private function parameters 2013-06-26 09:52:50 -04:00
Dennis Luxen
05c50bc64f adding missing include 2013-06-26 09:50:06 -04:00
Dennis Luxen
2b8b876713 Reorder include block according to style guide 2013-06-26 09:43:13 -04:00
Dennis Luxen
648f9c9723 replacing nearest neighbor grid by static r-tree 2013-06-26 09:32:03 -04:00
Dennis Luxen
fdda21b114 use explicit data types 2013-06-24 17:02:28 -04:00
Dennis Luxen
2b0590f9bd Remove GUARANTEE macro 2013-06-24 16:55:43 -04:00
Dennis Luxen
48a007febd minor style fix 2013-06-24 16:11:15 -04:00
Dennis Luxen
fe2f1d32b5 80 char wrap 2013-06-24 14:52:53 -04:00
Dennis Luxen
2fcbb19e72 80 char wrap 2013-06-24 14:43:36 -04:00
Dennis Luxen
7406e83dde De-template-izing some of the code for faster (re-)compile 2013-06-24 14:12:16 -04:00
Dennis Luxen
aaa25e5d48 De-template-izing some of the code for faster (re-)compile 2013-06-24 14:11:53 -04:00
DennisOSRM
af5f2f85da Workaround for failing tests 2013-02-26 09:57:29 +01:00
DennisOSRM
ea83231da5 Fixing incorrect initialization of hash function 2013-02-25 18:47:17 +01:00
DennisOSRM
f315a013b8 Refactoring InputEdge type and removing dead code 2013-02-14 17:12:12 +01:00
DennisOSRM
0f03beb2b5 replacing c-style size_t with the one from std namespace 2013-02-12 15:46:40 +01:00
DennisOSRM
7e39c43896 allocate data in chunks of 8MB 2013-02-12 15:24:35 +01:00
DennisOSRM
906d28fa5d Correct wrong allocation, use std::vector for node array and pass PODs
by value not ref
2013-02-12 15:23:09 +01:00
DennisOSRM
348e656671 Merge branch 'feature/opposite_direction' into develop 2013-02-04 18:38:15 +01:00
DennisOSRM
405600783e introducing further typedefs to make code more readable 2013-02-03 14:55:49 +01:00
DennisOSRM
5b5e9296b3 Adding const to parameter and rehash to give map 1000 buckets 2013-02-03 14:54:22 +01:00
DennisOSRM
0ffa973ec6 Exit gracefully when data is empty 2013-01-27 23:08:45 +01:00
DennisOSRM
01a6e3c619 Fixed the computation of reverse edge weight 2013-01-27 14:36:57 +01:00
DennisOSRM
6948d56e5d Fixing edge array sentinel at position n+1 2013-01-27 14:36:57 +01:00
DennisOSRM
6373b3e49c Adding first implementation of back() reference function 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
4a52dd1c5b Fixing constant 2013-01-27 14:36:56 +01:00
DennisOSRM
dd1302e8b1 Added new TurnInstruction that indicates when to go against oneway
streets. It's important for cycling.
2013-01-27 14:36:56 +01:00
DennisOSRM
a64420d700 further const'ing 2013-01-11 22:22:57 +01:00
DennisOSRM
2ccd3da5b3 replacing unsafe strcpy operations 2013-01-11 22:13:02 +01:00
DennisOSRM
7449f81ed4 Reordering members in struct to actually exploit four byte padding,
partially fixes #563
2013-01-11 18:36:00 +01:00
DennisOSRM
2af9fcad68 Saving 3 bytes per original edge. 2013-01-06 19:38:03 +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
e70adbb1cb Using const-refs instead of copies when iterating vectors 2013-01-06 12:59:36 +01:00
Emil Tin
c4ed218a7a Revert "remove unused struct MinimalEdgeData"
This reverts commit 0235cf5d8e.
2013-01-01 23:01:52 +01:00
Emil Tin
0235cf5d8e remove unused struct MinimalEdgeData 2012-12-31 11:22:56 +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
DennisOSRM
00ed039621 Moving TurnInstruction to unsigned char 2012-12-17 13:14:43 +01:00
DennisOSRM
0f106c627b Adding a distance approximation that works great for short distances and
has a lot less calls to trigonometric functions
2012-12-17 11:22:44 +01:00
DennisOSRM
12500e4721 const'ing c'tor 2012-11-22 17:17:54 +01:00
DennisOSRM
166133a496 Setting size to zero after clear 2012-11-22 15:41:29 +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
f9d336ff88 prefix increment instead of postfix 2012-11-19 11:45:10 +01:00
DennisOSRM
7fda7f1f9b Use DeallocatingVector in DynamicGraph 2012-11-15 13:39:23 +01:00
DennisOSRM
f575da2ca8 Fixing tests that check for paths on equator and zero-meridian. It was a
forgotten corner case when checking a divide by zero. and no. that was
no fun to debug.
2012-11-12 19:17:25 +01:00
DennisOSRM
6f8148950e Speeding up parsing of car profile by about 30% 2012-11-12 17:00:36 +01:00
Dennis Luxen
b5ed992e94 Further refactorings 2012-11-12 10:58:57 +01:00
DennisOSRM
6eab47d768 Fixing origin (0,0) tests 2012-10-05 15:25:12 +02:00
DennisOSRM
0b2df9892d Changed haversine formula to be less sensitive to floating-point
inexactness.
2012-10-04 17:27:17 +02:00
DennisOSRM
c5ebef3499 pulling in changes to add up distances in doubles 2012-10-04 16:53:13 +02:00
DennisOSRM
549ce9a4d4 checking equality of edges by end and start coord. 2012-10-02 14:40:40 +02:00
DennisOSRM
1bef65bf2c Fixing corner case on lookup of nearest neighbor 2012-10-02 12:11:39 +02:00
DennisOSRM
db9292ee86 Fixes issue #203 2012-10-01 14:55:30 +02:00
DennisOSRM
4c02542dc5 removing some debug output 2012-09-28 12:29:46 +02:00
DennisOSRM
3673b1a324 Fixing cucumber test cases "Scenario: Latitudinal distances at longitude
x", also relates issues #412, #425 and probably some more.
2012-09-28 10:58:29 +02:00
DennisOSRM
c16c2adeda Fixes cucumber test features/bad.feature:15 2012-09-27 14:55:48 +02:00
Emil Tin
8abbe8db4a dont quantize distance to 10m, use double for summation 2012-09-22 11:01:05 +02:00
DennisOSRM
75cd287ab0 Partially fixes issue #420 2012-09-19 17:06:35 +02:00
DennisOSRM
1c415933da Fixing comparison of floats 2012-09-19 14:01:06 +02:00
DennisOSRM
ac588911ba Fixing warning detected by additional compiler flags 2012-09-19 13:48:04 +02:00
DennisOSRM
b448177278 Removing unused parameter 2012-09-19 12:02:50 +02:00
DennisOSRM
71d184c39b removing old style casts and unused parameters and fixed unsafe float
comparisons
2012-09-19 11:46:41 +02:00
DennisOSRM
5423cff7a8 Removing old style cast 2012-09-19 11:25:51 +02:00
DennisOSRM
aeb701f52e removing unused parameters 2012-09-19 11:18:24 +02:00
Dennis Luxen
aef6d1795e Partially fixes #421 2012-09-18 23:36:57 +02:00
DennisOSRM
9e6ac95e4f Output of used CRC32 method more verbose 2012-09-17 15:38:02 +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
1fdfac4aaf Refactoring extraction stuff 2012-08-27 17:40:59 +02:00
DennisOSRM
a127c705f2 backport of resize implementation 2012-08-27 16:16:59 +02:00
DennisOSRM
417fcde9db Using DeallocatingVector class instead of doing vector-swap-tricks 2012-08-22 17:36:30 +02:00
DennisOSRM
f69076f55c Using back reference instead of iterator arithmetic 2012-08-22 16:20:13 +02:00
Sarah Hoffmann
66c23b5843 extended access handling
This adds a few more configuration options for a more flexible access
tag handling:

accessTags -
  replaces accessTag and is an ordered list of access tags to take into
  account. The first tag in the list found will determine the access.
  This allows to model OSM's access hierarchy where a more specific
  access tag might override a more general one.
accessForbiddenKeys -
  unordered list of values that disallow access (similar to
  accessRestrictionKeys). Replaces hardcoded values in extractor.
accessForbiddenDefault -
  unordered list of highway types where access is forbidden unless an
  explicit positiv access tag is given. Replaces the current track
  hack.
2012-08-20 21:13:54 +02:00
DennisOSRM
922c218394 Fixing a bug that crashed the daemon once in a while. 2012-08-13 15:40:22 +02:00
DennisOSRM
0276cf579a Marking default constructor in iterator as private 2012-07-23 16:12:22 +02:00
DennisOSRM
7467e11147 Exploration of tiny components. 2012-07-13 17:01:21 +02:00
DennisOSRM
4e2650d6e7 Fixing missing include 2012-07-10 11:56:40 +02:00
DennisOSRM
f60f676563 Cache-Aware preprocessing with less space requirements 2012-07-10 11:50:41 +02:00
DennisOSRM
f95c040bed Fixed some missing initializations. 2012-07-02 16:36:25 +02:00
DennisOSRM
9b17543021 Fixes issue #306 2012-07-02 16:00:20 +02:00
DennisOSRM
1326c5a01f Removed all header file includes from typedef.h 2012-07-02 16:00:00 +02:00
DennisOSRM
bddac87321 Use libosmpbf instead of self-supplied PBF format definitions 2012-06-27 19:00:58 +02:00
DennisOSRM
61efd41194 Implemented T-Test and output of route options 2012-06-19 17:26:34 +02:00
DennisOSRM
7f0d40f459 First (buggy) implementation of single via node alternative routes.
Proof of concept which is imcomplete.
2012-06-15 18:47:27 +02:00
DennisOSRM
fa62f70cdf Implementation of copy-insert of LRU cache 2012-06-12 13:25:38 +02:00
DennisOSRM
bbad30c6e0 Fixes issue #259 2012-05-31 14:01:51 +02:00
DennisOSRM
e29b19805c Moving XOR-FastHash to its own File 2012-05-25 11:41:52 +02:00
DennisOSRM
863b9829ca Adding new Container 2012-05-23 21:22:33 +02:00
DennisOSRM
666371099e Independent set tie-breaker in O(1) space and time 2012-05-23 21:18:38 +02:00
DennisOSRM
0d0a27d1c2 Re-adding sorting in NNGrid construction 2012-05-16 15:01:52 +02:00
DennisOSRM
56c81dd890 Minor infix prefix change. 2012-05-15 16:45:46 +02:00
DennisOSRM
00502e0476 Packed struct saves four bytes for each edge-expanded graph edge 2012-05-15 16:44:29 +02:00
DennisOSRM
2eb251bd7f Updated protobuffer files to newest version. 2012-05-15 16:43:52 +02:00
DennisOSRM
486eed4875 Using memcpy to copy bytes instead of hard-coded loops. Allows compilers
to apply more magic
2012-05-14 13:48:48 +02:00
DennisOSRM
db2047264c Ignore areas when set so in speedprofile.ini 2012-05-14 12:01:45 +02:00
DennisOSRM
a0a0caad38 Moving repeated hashmap construction to outer loop 2012-05-11 15:32:30 +02:00
DennisOSRM
2e878d8f2e removing debug output 2012-05-09 21:12:54 +02:00
DennisOSRM
78b4d715d5 Less I/O during query in NN Grid 2012-05-09 21:02:42 +02:00