Commit Graph

747 Commits

Author SHA1 Message Date
Dennis Luxen
a47467f29b store facade ptr in c'tor, save a param in sub-sequent function calls 2014-05-20 14:33:01 +02:00
Dennis Luxen
a80815d57a implements output generation through a dedicated JSON container:
- JSON syntax is not scattered over several files, but one place
- Reduces code duplication
- breaking changes:
  - new property in json(p) formatted response: "found_alternative": True/False
  - returned filenames now response.js(on) or route.gpx
  - /hello plugin returns JSON now
2014-05-20 14:33:00 +02:00
Dennis Luxen
acab77f4f8 add simple isValid() function to PhantomNodes 2014-05-20 14:33:00 +02:00
Dennis Luxen
e769821e0f use range based for loops to traverse graphs 2014-05-13 16:56:30 +02:00
Dennis Luxen
35c5be6475 add missing includes <string> and <limits> 2014-05-10 14:54:46 +02:00
Dennis Luxen
985a8e9f97 removing boost cref and betting on move semantics 2014-05-09 19:10:11 +02:00
Dennis Luxen
5e26e4c22d replacing all boost unordereds 2014-05-09 18:40:07 +02:00
Dennis Luxen
b3ec9c9323 reformat 2014-05-09 16:48:58 +02:00
Dennis Luxen
84ffedd95d replace boost::shared_ptr 2014-05-09 16:47:42 +02:00
Dennis Luxen
694ce9d04f add forgotten include 2014-05-09 15:12:42 +02:00
Dennis Luxen
aebe8572f9 reformat NodeBasedGraph 2014-05-09 14:21:52 +02:00
Patrick Niklaus
e00ef38305 Apply clang-format on BFSComponentExplorer and RestrictionMap 2014-05-09 00:37:05 +02:00
Patrick Niklaus
22d0861f6d Move BFSComponentExplorer to Contractor/ 2014-05-09 00:37:05 +02:00
Patrick Niklaus
5265f38c35 Switched to std::shared_ptr in Contractor/ 2014-05-09 00:37:05 +02:00
Patrick Niklaus
5a13c6cc3f Move BFSComponentExplorer to own header. 2014-05-09 00:05:27 +02:00
Patrick Niklaus
2c0fa2a9f6 Split RestrictionMap and NodeBasedGraph from EdgeBasedGraphFactory
First step in an effort to simplify EdgeBasedGraphFactory.
2014-05-09 00:05:27 +02:00
Dennis Luxen
f060dfda40 refactor list of const static int into scoped enum 2014-05-08 18:04:05 +02:00
Dennis Luxen
b0ead129ca use proper types instead of implicit casts 2014-05-08 16:39:38 +02:00
Dennis Luxen
15a95ff425 remove superflous includes 2014-05-08 15:49:32 +02:00
Dennis Luxen
37b8f97d60 C++11 migration:
- use lambda functions instead of binding member functions
- replace boost::mutex by STLs <mutex>
- reformat according to new guidelines
2014-05-08 15:47:48 +02:00
Dennis Luxen
9587923e55 make variable names consistent, migrate Plugins 2014-05-08 11:15:19 +02:00
Dennis Luxen
bed5c8002f pass parameter by ref instead of by val:
- fixes coverity issue 1212009 Big parameter passed by value
2014-05-08 08:48:55 +02:00
Dennis Luxen
e12ad48822 migrate DataStructures to C++11 2014-05-07 18:39:16 +02:00
Dennis Luxen
6abbb06ff6 replace UINT_MAX by numeric limits max() 2014-05-07 17:25:35 +02:00
Dennis Luxen
5d8b4cb261 use numeric limits instead of C-style UINT_MAX 2014-05-07 15:37:22 +02:00
Dennis Luxen
9ee615020f break out RouteParameters into compile unit 2014-05-07 15:36:53 +02:00
Dennis Luxen
0ff7ac6aad migrate HilbertValue class to C++11, use fwd decl, remove boost/integer 2014-05-07 14:47:23 +02:00
Dennis Luxen
859502c504 remove boost/integer include 2014-05-07 14:46:46 +02:00
Dennis Luxen
9c2926ef8a remove boost/integer include 2014-05-07 14:44:18 +02:00
Dennis Luxen
8e89f80588 make space usage more tight in Coordinate->String conversion 2014-05-07 14:12:57 +02:00
Dennis Luxen
dd4461d473 remove broken assert 2014-05-07 10:39:34 +02:00
Dennis Luxen
2706a0bec1 revert:
- GCC <4.8 does not support thread_local keyword.
- sticking with boost::thread_specific_ptr<> for now
2014-05-07 10:39:34 +02:00
Dennis Luxen
46b207e08e mega-patch:
- fix regression that turned tree into binary search
- use C++11 emplace and thread local facility
- sort out includes
- use much faster approximations to save on trigonometry
- use higher fan-out but make leafs a little more compact
- replace raw C-style array by C++11's std::array
2014-05-07 10:39:34 +02:00
Dennis Luxen
66fb5fc9c8 allow approximation of euclidian distances by lat/lon components 2014-05-07 10:38:31 +02:00
Dennis Luxen
2d3fb858ad move StaticGraph to C++11 2014-05-07 10:38:31 +02:00
Dennis Luxen
7bf74c0917 replace UINT_MAX with proper numeric limits call 2014-05-07 10:38:31 +02:00
Dennis Luxen
5b22dffa6f move BinaryHeap to C++11 2014-05-07 10:38:31 +02:00
Dennis Luxen
a45508a96b fix coverity issues 2014-05-07 10:38:28 +02:00
Dennis Luxen
e3cc896a42 consolidate duplicated distance calculations 2014-05-07 10:38:28 +02:00
Dennis Luxen
7b0b378abc fix a performance regression 2014-05-07 10:35:56 +02:00
Dennis Luxen
265af1f790 minor refactoring 2014-04-28 17:27:15 +02:00
Dennis Luxen
ec3f9695cd remove redundant local variable 2014-04-28 13:26:20 +02:00
Dennis Luxen
16ca8da438 remove deactivated debug out for good 2014-04-25 13:31:08 +02:00
Dennis Luxen
0eed39cdf1 rebase branch onto develop 2014-04-24 18:13:50 +02:00
Dennis Luxen
ace59411cb fix and/or remove unused variables 2014-04-24 13:31:04 +02:00
Dennis Luxen
0f8a32f38c shape up code 2014-04-24 13:31:04 +02:00
Dennis Luxen
d0e158ca07 fix unpacking of geometry for shared memory 2014-04-24 13:17:11 +02:00
Dennis Luxen
9b3dab8055 implement loading of compressed geometries 2014-04-24 13:06:56 +02:00
Dennis Luxen
7a6a5f6612 implement population of shared vector<bool> overload (manually, yikes) 2014-04-24 13:06:56 +02:00
Dennis Luxen
db5fd5506d partial implementation of new datastore functions 2014-04-24 13:06:55 +02:00
Dennis Luxen
4bb5270f25 cut back debug verbosity 2014-04-24 13:06:55 +02:00
Dennis Luxen
5b8d8a83dd fix mangled offsets and edge weights on compressed edges (all tests passing) 2014-04-24 13:06:55 +02:00
Dennis Luxen
8ec3d549a6 further fixes but forward/reverse edge weights are reversed 2014-04-24 13:06:55 +02:00
Dennis Luxen
394e369b54 fix edge-expanded offsets 2014-04-24 13:06:55 +02:00
Dennis Luxen
899ab9ddc0 remove some uncommented code 2014-04-24 13:06:54 +02:00
Dennis Luxen
752fb880be switch edge-expanded street name indexes to be first segment names (18 failed tests left) 2014-04-24 12:55:53 +02:00
Dennis Luxen
44077cb007 refactor and streamline use of TurnInstructionsClass members 2014-04-24 12:55:53 +02:00
Dennis Luxen
7b5902a580 rename phantom nodes members 2014-04-24 12:55:53 +02:00
Dennis Luxen
2861bacd2a fix check for invalid phantom nodes (20 failed left) 2014-04-24 12:55:53 +02:00
Dennis Luxen
9cc49f6ff3 remove debug output 2014-04-24 12:54:24 +02:00
Dennis Luxen
87f036e538 fixing sentinel nodes in adjacency list graph data structure 2014-04-24 12:54:24 +02:00
Dennis Luxen
fdebec6448 correct partial distances 2014-04-24 12:51:18 +02:00
Dennis Luxen
bc0665cd9f fix offsets for start and end 2014-04-24 12:51:17 +02:00
Dennis Luxen
09c76939f1 minor code beauty issue 2014-04-24 12:51:17 +02:00
Dennis Luxen
0b3f3bdf92 fix test for borked lat/lons 2014-04-24 12:51:17 +02:00
Dennis Luxen
6b91d6692f unpacking target correctly, also partial unpacking origin and destination are on the very same packed edge 2014-04-24 12:47:36 +02:00
Dennis Luxen
eca09e6c81 unpacking of target segment works 2014-04-24 12:47:00 +02:00
Dennis Luxen
874c579f86 correctly unpacking the first segment 2014-04-24 12:15:48 +02:00
Dennis Luxen
b679a94930 first segment needs to be properly cut 2014-04-24 12:15:04 +02:00
Dennis Luxen
5bde545ce3 All good, but needs unpacking of start and end 2014-04-24 12:07:46 +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
c71c8b0047 Unpacking of intermediate paths 2014-04-24 12:03:19 +02:00
Dennis Luxen
3be644265b remove remnants of C-Style includes 2014-04-24 11:38:54 +02:00
Dennis Luxen
cd6874ca60 remove remnants of C-Style includes 2014-04-24 11:28:12 +02:00
Dennis Luxen
7083978f9d remove remnants of C-Style includes 2014-04-24 11:28:12 +02:00
Dennis Luxen
4d132489c1 remove remnants of C-Style includes 2014-04-24 11:28:11 +02:00
Dennis Luxen
b5170ed1fd remove trivial geometry nodes 2014-04-24 11:28:11 +02:00
Dennis Luxen
64720c2d2e several lints fixed that were detected by facebook's flint 2014-04-21 17:40:07 +02:00
Dennis Luxen
03f4aaa2d6 make functions const, make short variable name more telling 2014-03-17 15:31:13 +01:00
Dennis Luxen
d67c3f36ff call function object instead of static function 2014-03-17 15:28:42 +01:00
Dennis Luxen
e199d30beb move static function into funtion object 2014-03-17 15:27:33 +01:00
Dennis Luxen
8a6d07342e remove redundant local variable 2014-03-17 15:14:29 +01:00
Dennis Luxen
ab39457fe1 move bit-wise operator out of conditions 2014-03-17 15:13:36 +01:00
Dennis Luxen
e6933ea413 avoid private static member functions 2014-03-17 15:12:13 +01:00
Dennis Luxen
422e0c44d5 reverse inverted logic 2014-03-17 14:55:33 +01:00
Dennis Luxen
e07423f260 minor copy-edits to PR #946 2014-03-12 13:56:25 +01:00
Daniel Karch
ecfda146b2 minor change 2014-03-12 10:48:54 +01:00
Daniel Karch
f923f508f5 applied requested changes to EdgeBasedNode.h 2014-03-12 10:24:35 +01:00
Daniel Karch
b465dabe77 Refactored the EdgeBasedNode class.
This includes more robust computations in ComputePerpendicularDistance.
There were cases where ComputePerpendicularDistance divided by zero and had
to handle special cases, even though this was not necessary.
2014-03-11 16:40:20 +01:00
Dennis Luxen
4c48cda4cd refactor HashTable facade class 2014-02-14 18:18:26 +01:00
Dennis Luxen
b5b4280c3b remove c-style calls to fabs 2014-01-27 11:26:34 +01:00
Dennis Luxen
22c2efded9 Some mild refactoring of the BinaryHeap code. style only 2014-01-24 11:24:23 +01:00
Dennis Luxen
058219528d fix floating point accuracy woes on certain hardware platforms 2014-01-22 19:35:30 +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
ce60af5029 fixes issues #770 and #856 2014-01-08 17:18:59 +01:00
DennisOSRM
41f3f53540 move includes to include/osrm 2013-12-20 13:12:56 +01:00
Dennis Luxen
a26d982f52 deactivate dead code 2013-12-19 19:19:26 +01:00
Dennis Luxen
ffd36b5489 add missing include 2013-12-18 12:00:58 +01:00
Dennis Luxen
095a58b1bd remove deleted files from repo 2013-12-17 18:01:42 +01:00
Dennis Luxen
fd2f000075 install lib header files with make install target 2013-12-17 17:59:44 +01:00
Dennis Luxen
96aff57275 fixes #731, perpendicular projection to nearest location 2013-12-16 17:36:36 +01:00
Dennis Luxen
b030fe7db2 break out Coordinate in compile unit 2013-12-13 17:26:57 -05:00
Dennis Luxen
d0b5929a9e explicitly give the locations of all via locations in response 2013-12-12 18:35:23 -05:00
Dennis Luxen
e0dd4848b0 add function to set edge target 2013-12-12 18:32:12 -05:00
Dennis Luxen
cef01f5dbc remove superflous blank padding 2013-12-12 18:31:08 -05:00
Dennis Luxen
fb13e3ddb8 add new include 2013-12-09 11:47:42 -05:00
Dennis Luxen
ca17efd764 break out OriginalEdgeData class into its own include 2013-12-09 11:45:45 -05:00
Dennis Luxen
009f08dca3 Refactoring PathData class 2013-12-08 19:10:10 +01:00
Dennis Luxen
2edf4906a4 refactoring SegmentInformation to fit into a cache line 2013-12-08 18:33:53 +01:00
Dennis Luxen
997dcad799 make rtree query do O(1) allocations only 2013-12-08 15:52:21 +01:00
Dennis Luxen
e35efd001c move implementation details out of templat'ized container code 2013-12-08 15:52:21 +01:00
Dennis Luxen
50d6b10be4 move distance computation from r-tree to element type class 2013-12-08 15:52:21 +01:00
Dennis Luxen
5ef7ea794a move Hilbert curve computation in compile unit 2013-12-08 15:52:20 +01:00
Dennis Luxen
8c16686150 remove dead code 2013-11-21 00:05:37 +01:00
Dennis Luxen
7cbadfbd12 remove dead code 2013-11-21 00:05:28 +01:00
Dennis Luxen
5fe24cb689 report a warning if shared memory segment cannot be locked into RAM 2013-11-19 10:38:59 +01:00
Dennis Luxen
2bd1e46ab9 Remove left-over merge hunk 2013-11-18 11:54:39 +01:00
Dennis Luxen
7ceab5c88c lock data into RAM on Linux 2013-11-14 12:33:09 -05:00
Dennis Luxen
30b2c1ad61 refactor input restrictions class 2013-11-13 15:23:44 -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
58ef7db5d6 allow 64 bit sizes for shared memory regions 2013-11-12 15:01:40 -05:00
Dennis Luxen
c87c843308 fix coverity issue 1121926, Uninitialized pointer field 2013-10-31 13:16:46 +01:00
Dennis Luxen
6453cdf0d6 replace all casserts with Boost.Assert 2013-10-30 18:52:23 +01:00
Dennis Luxen
faaf97ef62 return if removal of shmem segment was successful 2013-10-29 18:43:11 +01:00
Dennis Luxen
0103b59e61 close previously allocated filestream 2013-10-28 14:21:31 +01:00
Dennis Luxen
ed215657e6 remove deprecatedd swap method 2013-10-25 17:43:01 +02:00
Dennis Luxen
3e63b14192 add ability to _not_ destroy prev allocated memory 2013-10-25 14:00:34 +02:00
Dennis Luxen
d0198649f2 use doubles in mercartor projection functions 2013-10-21 17:13:02 +02:00
Dennis Luxen
cf69f43166 add proper licence header to newly added files 2013-10-21 11:45:16 +02:00
Dennis Luxen
f21fe81e16 remove superflous include guard 2013-10-15 17:06:22 +02:00
Dennis Luxen
593dfd0108 Merging and rebasing of develop into shared_memory
Conflicts:
	DataStructures/SearchEngine.h
	DataStructures/StaticRTree.h
	Descriptors/DescriptionFactory.cpp
	Library/OSRM.cpp
	Library/OSRM.h
	RoutingAlgorithms/BasicRoutingInterface.h
	RoutingAlgorithms/ShortestPathRouting.h
	Server/DataStructures/BaseDataFacade.h
	Server/DataStructures/InternalDataFacade.h
	Server/DataStructures/QueryObjectsStorage.cpp
	Server/DataStructures/SharedDataFacade.h
	routed.cpp
2013-10-15 17:04:53 +02:00
Dennis Luxen
424055c04e fix iterator concept implementation 2013-10-15 14:35:36 +02:00
Dennis Luxen
02daf17326 fix iterator concept implementation 2013-10-15 14:35:36 +02:00
DennisOSRM
27a760c58c Move edge-based node out ouf surrounding class 2013-10-15 14:35:36 +02:00
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