Dennis Luxen
5d93c68790
remove further debug things
2014-04-24 13:06:56 +02:00
Dennis Luxen
fa04706484
remove debug code, add C++11 todo
2014-04-24 13:06:56 +02:00
Dennis Luxen
a4d6e5c9cc
reformat geometry compressor according to new guidelines
2014-04-24 13:06:56 +02:00
Dennis Luxen
4f85fd28cf
add todo for the switch to C++11
2014-04-24 13:06:56 +02:00
Dennis Luxen
4bb5270f25
cut back debug verbosity
2014-04-24 13:06:55 +02:00
Dennis Luxen
0f06c71796
remove debug output
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
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
26397e4692
remove debug output
2014-04-24 12:55:52 +02:00
Dennis Luxen
48d23194af
fix traffic signal penalty in compressed graph
2014-04-24 12:55:52 +02:00
Dennis Luxen
bcaea1a617
remove debug output
2014-04-24 12:54:25 +02:00
Dennis Luxen
87f036e538
fixing sentinel nodes in adjacency list graph data structure
2014-04-24 12:54:24 +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
f16cb3c52d
compressed geometries get serialized in R-tree
2014-04-24 12:05:43 +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
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
7b14de13ec
assign complete edge data if duplicate shortcut edge has lower weight
2014-03-03 14:08:34 +01:00
alex85k
275961f088
Fix assertion in debug version
...
When running tests on FreeBSD 10 on debug verion I got boost assertion errors in mutex.hpp:79 .
It seems that mutex unlock is not needed (it is already unlocked and behavior is undefined).
2014-02-04 19:56:23 +06:00
Dennis Luxen
ce784e0491
distinguish between left and right, thx @emiltin
2014-01-27 12:58:23 +01:00
Dennis Luxen
65ad3bb941
fix test regression
2014-01-27 12:55:17 +01:00
Dennis Luxen
b5b4280c3b
remove c-style calls to fabs
2014-01-27 11:26:34 +01:00
Dennis Luxen
0649f6e607
preparing call of turn penalty function
2014-01-27 11:18:26 +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
8acf081be3
remove dead function decl
2013-12-27 15:47:51 +01:00
Dennis Luxen
758027e2e0
untangling includes to cut down compile time
2013-12-13 18:49:05 -05:00
Dennis Luxen
b030fe7db2
break out Coordinate in compile unit
2013-12-13 17:26:57 -05:00
Dennis Luxen
d5eee3138f
fixes issues #768 , #794 , #812
2013-12-11 15:36:32 -05:00
Dennis Luxen
ca17efd764
break out OriginalEdgeData class into its own include
2013-12-09 11:45:45 -05:00
Dennis Luxen
dc9db06cc8
reverting skeleton, introducing later
2013-12-08 15:52:23 +01:00
Dennis Luxen
cb5931aaeb
add skeleton for geometry compression
2013-12-08 15:52:23 +01:00
Dennis Luxen
f47d944349
do not seek in temporary storage
2013-12-08 15:52:22 +01:00
Dennis Luxen
682079adc6
add buffering to temporary storage
2013-12-08 15:52:22 +01:00
Dennis Luxen
f0fb97e67c
add buffering to temporary storage
2013-12-08 15:52:22 +01:00
Dennis Luxen
6e5058f95f
further refactoring and code simplification
2013-12-08 15:52:22 +01:00
Dennis Luxen
31b8997518
partially fixes #768 , #794 , #812
2013-12-08 15:52:22 +01:00
Dennis Luxen
76a9723268
remove dead code
2013-12-08 15:52:22 +01:00
Dennis Luxen
5fe79764de
implements #801
2013-12-08 15:52:22 +01:00
Dennis Luxen
38bf0c276c
moving BFS exploration into its own function
2013-12-08 15:52:21 +01:00
Dennis Luxen
22abc27b6b
use explicit unsigned type in max operation
2013-12-08 15:52:21 +01:00
Dennis Luxen
19f6d885fe
remove potential division by zero
2013-12-08 15:52:21 +01:00
Dennis Luxen
b19a633441
add geometry compressor
2013-12-08 15:52:21 +01:00
DennisOSRM
27a760c58c
Move edge-based node out ouf surrounding class
2013-10-15 14:35:36 +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
5294fc4767
Fixing another coverity issue
2013-09-17 15:27:51 +02:00
Dennis Luxen
cf29621aa7
Making edge factor more verbose
2013-08-16 11:08:07 +02:00
Dennis Luxen
b7980b83df
removing dead comments
2013-08-15 15:51:07 +02:00
Dennis Luxen
0a0bed7ae0
Refactoring graph factory
2013-08-14 18:43:01 +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
764ad81537
Some mild refactoring
2013-08-13 18:34:33 +02:00
Dennis Luxen
e26c41095f
Some mild refactoring
2013-08-13 18:33:20 +02:00
Dennis Luxen
ef221e1c6c
Replacing log macros by more sophisticated mechanism
2013-08-08 14:17:01 +02:00
Dennis Luxen
b405029f0f
Refactoring base config class into proper ini file name
2013-08-06 17:23:40 +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
Dennis Luxen
5c84c12f40
Fixing errors from static analysis
2013-06-27 11:44:32 -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
747e4a7061
Reorder include block according to style guide
2013-06-26 09:49:00 -04:00
Dennis Luxen
648f9c9723
replacing nearest neighbor grid by static r-tree
2013-06-26 09:32:03 -04:00
Dennis Luxen
728bcc2b10
Removing debug output
2013-06-25 13:27:03 -04:00
Dennis Luxen
c75ae957f1
Remove GUARANTEE macro
2013-06-24 16:56:10 -04:00
Dennis Luxen
155e0fada6
Fixed an integer overflow in assertion
2013-06-24 16:05:27 -04:00
Dane Springmeyer
556b498e06
remove lexical cast, its evil
2013-05-14 20:12:47 -07:00
Dennis Luxen
6d61e950d6
Removing superflous semicolon
2013-05-13 08:06:25 -04:00
DennisOSRM
ff09af2812
Fixes #597 , compile issues with boost filesystem2.
2013-03-03 17:38:35 +01:00
DennisOSRM
2cc2c967d1
Compute turn angles in mercartor projection. Implements issues #596 ,
...
#532
2013-02-28 13:34:48 +01:00
DennisOSRM
bec4e4437d
Minor code refactoring
2013-02-27 19:47:04 +01:00
Emil Tin
f9abfbf68a
compute turn penalties in lua profiles
2013-02-27 19:33:33 +01:00
DennisOSRM
f780aa6160
Saving 4 bytes on each original edge. Simplifying handling of original
...
edge data
2013-02-14 17:11:18 +01:00
DennisOSRM
1c0202e790
Reordering initializations
2013-02-11 15:20:37 +01:00
DennisOSRM
918c978551
Fixes issue #585
2013-02-11 15:06:33 +01:00
DennisOSRM
348e656671
Merge branch 'feature/opposite_direction' into develop
2013-02-04 18:38:15 +01:00
Emil Tin
73c81a0a6c
Removing debug output
2013-02-03 18:13:57 +01:00
DennisOSRM
59ca59d431
Using unordered_set where it suffices
2013-02-03 13:19:23 +01:00
DennisOSRM
91dc1b6639
Adding curly braces where appropriate
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
296e7ccb08
Removing dead code
2013-01-23 11:34:16 +01:00
DennisOSRM
9da4e18099
Reordering padded struct
2013-01-18 18:59:38 +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
5e3c8cdd8e
errenous data check broke debug build
2012-12-17 17:41:45 +01:00
DennisOSRM
e839cb4b8c
Removing false continue statement that broke debug build.
2012-12-17 16:47:05 +01:00
DennisOSRM
5c3dad0c61
Removing false assertion that broke the debug build
2012-12-17 16:45:47 +01:00
DennisOSRM
00ed039621
Moving TurnInstruction to unsigned char
2012-12-17 13:14:43 +01:00
DennisOSRM
3c6121d192
Reverting change that used stxxl for temporaray stuff
2012-11-22 17:21:45 +01:00
DennisOSRM
5faf8d6951
Temporary edges saved in stxxl store; const & inline where feasible;
...
more efficient checks for divide-by-zero; witness search omits middle
node; Removed unneeded temporaries; Removed superflous includes; Saving
4 Bytes per node during contraction.
2012-11-19 11:43:46 +01:00
DennisOSRM
11d4d3ec30
Generate shared_ptr by make_shared macro
2012-11-15 13:43:33 +01:00
DennisOSRM
b39507efc8
Doing better checks to avoid unintended U-Turns
2012-10-02 12:09:34 +02:00
DennisOSRM
62f31f3e2d
Fixing corner case in contractor which may have lead to an incorrect
...
path with correct distance. Thx @DennisSchiefer
2012-10-01 16:15:55 +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
2faf9ad1b6
Proper initialization of shared_ptr by boost::make_shared
2012-09-19 09:29:03 +02:00
Dennis Luxen
a8a0d1b216
Removing superflous line
2012-09-18 23:39:27 +02:00
DennisOSRM
8050fec64f
Forgotten file to checking. Complete removal of speedprofile.ini and
...
further adaption of profile.lua
2012-09-13 14:12:44 +02:00
DennisOSRM
1fdfac4aaf
Refactoring extraction stuff
2012-08-27 17:40:59 +02:00
DennisOSRM
827b9e4be2
Removing an unnecessary sorting step.
2012-08-22 18:44:14 +02:00
DennisOSRM
417fcde9db
Using DeallocatingVector class instead of doing vector-swap-tricks
2012-08-22 17:36:30 +02:00
DennisOSRM
818c66e774
Fixes issue #334 (partially)
2012-08-22 16:46:47 +02:00
DennisOSRM
595579a6c2
Partially fixes issue #339
2012-08-14 14:31:45 +02:00
DennisOSRM
2143df2e4f
Removed non-informative console output
2012-08-14 13:44:34 +02:00
Jens Thiele
c2ab16f984
missing initializers
2012-08-13 16:47:24 +02:00
DennisOSRM
2cf175cf91
Removing access restriction hacks.
2012-07-25 18:32:32 +02:00
DennisOSRM
5dd1211f46
struct was not packed and therefore allocated four excess bytes per
...
edge-expanded node.
2012-07-16 14:12:17 +02:00
DennisOSRM
7261ce3b7f
Clearing vectors as soon as data is not needed anymore.
2012-07-16 13:20:56 +02:00
DennisOSRM
7467e11147
Exploration of tiny components.
2012-07-13 17:01:21 +02:00
DennisOSRM
9c1caba2fa
Merge branch 'master' of https://DennisOSRM@github.com/DennisOSRM/Project-OSRM.git
2012-07-10 14:54:26 +02:00
DennisOSRM
f60f676563
Cache-Aware preprocessing with less space requirements
2012-07-10 11:50:41 +02:00
DennisOSRM
7fddfd7a54
Fixes a bug caused by name changes in boost::filesystem library.
...
Workaround added if only V2 is avalailable. Fixes issue #327 and Rashers
complaint.
2012-07-09 21:56:27 +02:00
DennisOSRM
fd88aba8a1
Implementation for issue #306
2012-07-02 19:09:13 +02:00
DennisOSRM
9b17543021
Fixes issue #306
2012-07-02 16:00:20 +02:00
DennisOSRM
f01670db80
Reordering initializations
2012-06-29 15:32:22 +02:00
DennisOSRM
176fa301d3
Merge branch 'develop/AlternativeRoutes'
2012-06-27 13:36:00 +02:00
DennisOSRM
f2ce4f0ff1
Better checks for parallel edges, thanks @DennisSchiefer
2012-06-27 13:13:18 +02:00
DennisOSRM
a1affa6330
Reducing cache misses during contraction
2012-06-25 11:12:59 +02:00
DennisOSRM
61efd41194
Implemented T-Test and output of route options
2012-06-19 17:26:34 +02:00
DennisOSRM
a962deaffd
Reordering initilizations
2012-05-31 13:27:44 +02:00
DennisOSRM
e29b19805c
Moving XOR-FastHash to its own File
2012-05-25 11:41:52 +02:00
DennisOSRM
7194fe02d1
XORFastHash is now symmetric
2012-05-25 10:14:53 +02:00
DennisOSRM
666371099e
Independent set tie-breaker in O(1) space and time
2012-05-23 21:18:38 +02:00
DennisOSRM
fe35fefc75
Reserving additional 20% in edge-based graph factory per resize.
2012-05-15 11:40:41 +02:00
DennisOSRM
57b3f42b03
Freeing more memory in contractor during retrieval of edges.
2012-05-11 15:33:31 +02:00
DennisOSRM
30e76b4a32
Reordering members of utility struct
2012-05-11 15:11:13 +02:00
DennisOSRM
ad3ec9d856
Removing debug output
2012-05-10 11:40:12 +02:00
DennisOSRM
bfaab86330
Merge branch 'master' of https://DennisOSRM@github.com/DennisOSRM/Project-OSRM.git
2012-05-09 21:06:35 +02:00
DennisOSRM
6dfea376ee
const'ing variable
2012-05-09 21:01:09 +02:00
DennisOSRM
f0188c428f
Removing some debug output
2012-05-08 19:46:01 +02:00
DennisOSRM
5b247a3699
Removing unnecessary over-allocation
2012-05-08 11:12:53 +02:00
DennisOSRM
819c1729f1
Fixing an invalid read when contracting rather small graphs. Partially
...
fixes issue #218
2012-05-03 23:11:52 +02:00
DennisOSRM
908d92fa5c
Fixing debug build compilation
2012-05-03 20:49:05 +02:00
DennisOSRM
0a4aa11d09
Moving verbosity to debug mode
2012-05-03 11:59:58 +02:00
DennisOSRM
26662b7190
Original Edge Data gets written to output stream with buffering
2012-04-27 16:50:34 +02:00
DennisOSRM
8fdfff3014
Chopping off another 4 Bytes per Edge in Contractor by limiting original
...
Edge Count to 1<<28
2012-04-27 13:45:32 +02:00
DennisOSRM
0b83310100
Reverting some externalizations
2012-04-27 13:20:56 +02:00
DennisOSRM
8c2bd8bd88
Externalized even more of the temporary data structures.
2012-04-26 14:03:01 +02:00
DennisOSRM
bb98bc92ef
Moving temporary storage of edge-expanded graph to external memory
2012-04-26 11:19:45 +02:00
DennisOSRM
3c08b89923
more debug output added
2012-04-26 09:59:39 +02:00
DennisOSRM
7baef59b79
Merge remote-tracking branch 'origin/develop/GraphEdgeSeparation' into
...
develop/GraphEdgeSeparation
Conflicts:
Contractor/EdgeBasedGraphFactory.cpp
2012-04-25 19:01:58 +02:00
DennisOSRM
6fe580bd75
Undoing wrong merge. Flushing some memory before generation of
...
edge-expanded graph
2012-04-25 18:56:42 +02:00
DennisOSRM
91d875c157
trivial code change
2012-04-25 18:36:18 +02:00
DennisOSRM
7fa409a72f
moving back to vector
2012-04-25 18:32:59 +02:00
DennisOSRM
d8927ec5f8
Merge remote-tracking branch 'origin/feature/TrivialContraction' into develop/GraphEdgeSeparation
2012-04-25 18:31:23 +02:00
