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
							
						 
					 | 
					
						
						
						
						
							
						
						
							02e9f8aef3
							
						
					 | 
					
						
						
							
							Rework facades to accept ServerPaths object as configuration
						
						
						
						
						
					 | 
					
						2013-10-15 15:44:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DennisOSRM
							
						 
					 | 
					
						
						
						
						
							
						
						
							27a760c58c
							
						
					 | 
					
						
						
							
							Move edge-based node out ouf surrounding class
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							29e6b85f79
							
						
					 | 
					
						
						
							
							Add explicit shmem id for data loading
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b03366909
							
						
					 | 
					
						
						
							
							checking if data files actually exist
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							252113c838
							
						
					 | 
					
						
						
							
							implementing the fetch of name ids in shared memory
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							203b215093
							
						
					 | 
					
						
						
							
							loading correct file with rtree leafs and not inner nodes
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							76ee84dae8
							
						
					 | 
					
						
						
							
							printing debug output
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d00b2ebbb
							
						
					 | 
					
						
						
							
							Renaming variables to properly reflect its content
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b87a98bbda
							
						
					 | 
					
						
						
							
							street name file is now more canonical
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							f76361a345
							
						
					 | 
					
						
						
							
							changing file format for coordinates to be canonical
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							94e9dd8f28
							
						
					 | 
					
						
						
							
							store name id of edges in shmem, too
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							90215ca0dd
							
						
					 | 
					
						
						
							
							move shmem stored sizes to 64 bits
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							83205290de
							
						
					 | 
					
						
						
							
							Reordering resource aquisition
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							02fd528c32
							
						
					 | 
					
						
						
							
							removing debug output
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a04700bae
							
						
					 | 
					
						
						
							
							create sentinel to adjancency array during preprocessing
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							9522e6e714
							
						
					 | 
					
						
						
							
							properly check for (non-)empty vectors
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							7836ea4479
							
						
					 | 
					
						
						
							
							implement GetName() for shared memory (copy&paste)
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							34048497e7
							
						
					 | 
					
						
						
							
							implement GetName for internal memory
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							5197422482
							
						
					 | 
					
						
						
							
							fetch ptr from shared memory to via node list
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9987c2734
							
						
					 | 
					
						
						
							
							load street names into internal memory
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9671b4712
							
						
					 | 
					
						
						
							
							load via node information from shared memory
						
						
						
						
						
					 | 
					
						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
							
						 
					 | 
					
						
						
						
						
							
						
						
							2dd2d3dd7b
							
						
					 | 
					
						
						
							
							adjust facade to pass compilation
						
						
						
						
						
					 | 
					
						2013-10-15 14:31:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b018ea7b1b
							
						
					 | 
					
						
						
							
							Give all data types in shared memory
						
						
						
						
						
					 | 
					
						2013-10-15 14:31:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6cdca35d4
							
						
					 | 
					
						
						
							
							Use typedef instead of base class
						
						
						
						
						
					 | 
					
						2013-10-15 14:31:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							056c95670f
							
						
					 | 
					
						
						
							
							Added list of all data types in shared memory
						
						
						
						
						
					 | 
					
						2013-10-15 14:31:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DennisOSRM
							
						 
					 | 
					
						
						
						
						
							
						
						
							642473244e
							
						
					 | 
					
						
						
							
							fixing include typos
						
						
						
						
						
					 | 
					
						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
							
						 
					 | 
					
						
						
						
						
							
						
						
							9452c7e0c7
							
						
					 | 
					
						
						
							
							further implementation of data facades
						
						
						
						
						
					 | 
					
						2013-10-15 14:19:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							092f1a4959
							
						
					 | 
					
						
						
							
							corrected include fence
						
						
						
						
						
					 | 
					
						2013-10-15 14:14:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							21bee7e40c
							
						
					 | 
					
						
						
							
							Further includes in Facades
						
						
						
						
						
					 | 
					
						2013-10-15 14:14:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9ac0ac725
							
						
					 | 
					
						
						
							
							Mockups for data facades
						
						
						
						
						
					 | 
					
						2013-10-15 14:12:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							5dc1ed6696
							
						
					 | 
					
						
						
							
							plugging in base facade ptr
						
						
						
						
						
					 | 
					
						2013-10-15 14:09:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b55f66e69c
							
						
					 | 
					
						
						
							
							added graph data access
						
						
						
						
						
					 | 
					
						2013-10-15 14:08:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							fa665c5494
							
						
					 | 
					
						
						
							
							Facade base class to provide all data access
						
						
						
						
						
					 | 
					
						2013-10-15 14:05:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c6f85fd25
							
						
					 | 
					
						
						
							
							Further includes in Facades
						
						
						
						
						
					 | 
					
						2013-10-15 14:04:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b51d3da7e5
							
						
					 | 
					
						
						
							
							Mockups for data facades
						
						
						
						
						
					 | 
					
						2013-10-15 14:04:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							861dbd5977
							
						
					 | 
					
						
						
							
							plugging in base facade ptr
						
						
						
						
						
					 | 
					
						2013-10-15 14:02:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							5001fcdd53
							
						
					 | 
					
						
						
							
							added graph data access
						
						
						
						
						
					 | 
					
						2013-10-15 14:02:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							eeb47dc724
							
						
					 | 
					
						
						
							
							remove unneeded white spaces
						
						
						
						
						
					 | 
					
						2013-10-15 14:02:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							18b57fa6aa
							
						
					 | 
					
						
						
							
							Facade base class to provide all data access
						
						
						
						
						
					 | 
					
						2013-10-15 13:45:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							12bb4d75fd
							
						
					 | 
					
						
						
							
							Adding shared memory data types
						
						
						
						
						
					 | 
					
						2013-10-15 13:45:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							29499f21c5
							
						
					 | 
					
						
						
							
							License change to (simplified) 2-clause BSD. Good riddance, AGPL
						
						
						
						
						
					 | 
					
						2013-10-14 13:42:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DennisOSRM
							
						 
					 | 
					
						
						
						
						
							
						
						
							467cf73635
							
						
					 | 
					
						
						
							
							load timestamp properly
						
						
						
						
						
					 | 
					
						2013-10-13 14:26:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DennisOSRM
							
						 
					 | 
					
						
						
						
						
							
						
						
							457519eae3
							
						
					 | 
					
						
						
							
							Fixes resource leaks and removes deprecated c_str() calls where possible
						
						
						
						
						
					 | 
					
						2013-10-13 14:13:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Emil Tin
							
						 
					 | 
					
						
						
						
						
							
						
						
							644fad8355
							
						
					 | 
					
						
						
							
							allow old capitalized option names in routed, few other adjustments
						
						
						
						
						
					 | 
					
						2013-10-12 09:59:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Emil Tin
							
						 
					 | 
					
						
						
						
						
							
						
						
							613e38d7f8
							
						
					 | 
					
						
						
							
							use boost program_options in osrm-prepare/routed
						
						
						
						
						
					 | 
					
						2013-10-12 09:59:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DennisOSRM
							
						 
					 | 
					
						
						
						
						
							
						
						
							dee7c339b3
							
						
					 | 
					
						
						
							
							Move edge-based node out ouf surrounding class
						
						
						
						
						
					 | 
					
						2013-10-11 16:14:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							2211c69455
							
						
					 | 
					
						
						
							
							Add explicit shmem id for data loading
						
						
						
						
						
					 | 
					
						2013-10-08 18:10:31 +02:00 | 
					
					
						
						
							
							
							
						
					 |