From 96cc44e52147c31f0a4725b67a9adf43e02f959b Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 24 Sep 2013 10:33:29 +0200 Subject: [PATCH 01/36] Compile fixes on RHEL5/Fedora, see #541 --- DataStructures/HashTable.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DataStructures/HashTable.h b/DataStructures/HashTable.h index 465caca0e..f6bd786cb 100644 --- a/DataStructures/HashTable.h +++ b/DataStructures/HashTable.h @@ -36,6 +36,11 @@ public: HashTable(const unsigned size) : super(size) { } + HashTable &operator=(const HashTable &other) { + super::operator = (other); + return *this; + } + inline void Add(const keyT& key, const valueT& value){ super::insert(std::make_pair(key, value)); } From 2b077d140ff00e813228cf6da423834fb4b0aa16 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 2 Oct 2013 11:22:42 +0200 Subject: [PATCH 02/36] Fixing #726, rounding woes and machine epsilon --- DataStructures/StaticRTree.h | 42 ++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 5bf27b434..a90414a24 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -42,11 +42,8 @@ or see http://www.gnu.org/licenses/agpl.txt. #include #include -#include -#include -#include - #include +#include #include #include #include @@ -614,7 +611,7 @@ public: ); BOOST_ASSERT_MSG( - FLT_EPSILON > (0. - traversal_queue.top().min_dist), + std::numeric_limits::epsilon() > (0. - traversal_queue.top().min_dist), "Root element in NN Search has min dist != 0." ); @@ -728,8 +725,8 @@ public: ); BOOST_ASSERT_MSG( - FLT_EPSILON > (0. - traversal_queue.top().min_dist), - "Root element in NN Search has min dist != 0." + std::numeric_limits::epsilon() > (0. - traversal_queue.top().min_dist), + "Root element in NN Search has min dist != 0." ); while(!traversal_queue.empty()) { @@ -744,7 +741,7 @@ public: LeafNode current_leaf_node; LoadLeafFromDisk(current_tree_node.children[0], current_leaf_node); ++io_count; - //SimpleLogger().Write() << "checking " << current_leaf_node.object_count << " elements"; + SimpleLogger().Write() << "checking " << current_leaf_node.object_count << " elements"; for(uint32_t i = 0; i < current_leaf_node.object_count; ++i) { DataT & current_edge = current_leaf_node.objects[i]; if(ignore_tiny_components && current_edge.belongsToTinyComponent) { @@ -763,6 +760,8 @@ public: ¤t_ratio ); + SimpleLogger().Write() << "Checking edge " << current_edge.id << " at dist: " << current_perpendicular_distance; + if( current_perpendicular_distance < min_dist && !DoubleEpsilonCompare( @@ -770,6 +769,9 @@ public: min_dist ) ) { //found a new minimum + SimpleLogger().Write() << "diff: " << std::setprecision(10) << std::fabs(current_perpendicular_distance - min_dist); + SimpleLogger().Write() << (DoubleEpsilonCompare(current_perpendicular_distance, min_dist) ? "same" : "different"); + SimpleLogger().Write() << std::setprecision(6) << "old min: " << min_dist << ", new min: " << current_perpendicular_distance; min_dist = current_perpendicular_distance; result_phantom_node.edgeBasedNode = current_edge.id; result_phantom_node.nodeBasedEdgeNameID = current_edge.nameID; @@ -798,8 +800,9 @@ public: current_end_coordinate ) ) { + BOOST_ASSERT_MSG(current_edge.id != result_phantom_node.edgeBasedNode, "IDs not different"); - //SimpleLogger().Write() << "found bidirected edge on nodes " << current_edge.id << " and " << result_phantom_node.edgeBasedNode; + SimpleLogger().Write() << "found bidirected edge on nodes " << current_edge.id << " and " << result_phantom_node.edgeBasedNode; result_phantom_node.weight2 = current_edge.weight; if(current_edge.id < result_phantom_node.edgeBasedNode) { result_phantom_node.edgeBasedNode = current_edge.id; @@ -830,6 +833,7 @@ public: traversal_queue.push(QueryCandidate(child_id, current_min_dist)); } } + SimpleLogger().Write() << result_phantom_node; } } @@ -883,14 +887,14 @@ private: const FixedPointCoordinate& source, const FixedPointCoordinate& target, FixedPointCoordinate& nearest, double *r) const { - const double x = static_cast(inputPoint.lat); - const double y = static_cast(inputPoint.lon); - const double a = static_cast(source.lat); - const double b = static_cast(source.lon); - const double c = static_cast(target.lat); - const double d = static_cast(target.lon); + const double x = inputPoint.lat/100000.; + const double y = inputPoint.lon/100000.; + const double a = source.lat/100000.; + const double b = source.lon/100000.; + const double c = target.lat/100000.; + const double d = target.lon/100000.; double p,q,mX,nY; - if(fabs(a-c) > FLT_EPSILON){ + if(std::fabs(a-c) > std::numeric_limits::epsilon() ){ const double m = (d-b)/(c-a); // slope // Projection of (x,y) on line joining (a,b) and (c,d) p = ((x + (m*y)) + (m*m*a - m*b))/(1. + m*m); @@ -920,8 +924,8 @@ private: // return std::sqrt(((d - y)*(d - y) + (c - x)*(c - x))); } // point lies in between - nearest.lat = p; - nearest.lon = q; + nearest.lat = p*100000.; + nearest.lon = q*100000.; // return std::sqrt((p-x)*(p-x) + (q-y)*(q-y)); return (p-x)*(p-x) + (q-y)*(q-y); } @@ -931,7 +935,7 @@ private: } inline bool DoubleEpsilonCompare(const double d1, const double d2) const { - return (std::fabs(d1 - d2) < FLT_EPSILON); + return (std::fabs(d1 - d2) < std::numeric_limits::epsilon() ); } }; From ca448e682a2c491cec5037634324bbf6320110b3 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 2 Oct 2013 11:23:13 +0200 Subject: [PATCH 03/36] using wider margin for expected result --- features/testbot/ferry.feature | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/testbot/ferry.feature b/features/testbot/ferry.feature index 63df1c85f..55160614b 100644 --- a/features/testbot/ferry.feature +++ b/features/testbot/ferry.feature @@ -171,5 +171,5 @@ Feature: Testbot - Handle ferry routes When I route I should get | from | to | route | time | - | a | g | abcdefg | 23400s +-1 | - | g | a | abcdefg | 23400s +-1 | + | a | g | abcdefg | 23400s +-2 | + | g | a | abcdefg | 23400s +-2 | From 12f91564fb252cba713e2208eedb9790c34826d2 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 2 Oct 2013 11:25:51 +0200 Subject: [PATCH 04/36] adding test to check regressions of #726 --- features/car/loop.feature | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 features/car/loop.feature diff --git a/features/car/loop.feature b/features/car/loop.feature new file mode 100644 index 000000000..8eb378da5 --- /dev/null +++ b/features/car/loop.feature @@ -0,0 +1,38 @@ +@routing @loop +Feature: Weird routings discovered + + Background: + Given the profile "car" + + Scenario: Weird looping, small input file + Given the input file features/data/loop_small.osm + + And the node locations + | node | lat | lon | + | a | 55.660818 | 12.574051 | + | b | 55.660073 | 12.574067 | + + When I route I should get + | from | to | route | turns | + | a | b | Artillerivej | head,destination | + + @a + Scenario: Weird looping, manual input + Given the node locations + | node | lat | lon | + | a | 55.660778 | 12.573909 | + | b | 55.660672 | 12.573693 | + | c | 55.660128 | 12.572546 | + | d | 55.660015 | 12.572476 | + | e | 55.660119 | 12.572325 | + | x | 55.660818 | 12.574051 | + | y | 55.660073 | 12.574067 | + + And the ways + | nodes | + | abc | + | cdec | + + When I route I should get + | from | to | route | turns | + | x | y | abc | head,destination | From 60546c9788b382f3598f1cc3336d443b579c88c6 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 2 Oct 2013 11:26:26 +0200 Subject: [PATCH 05/36] adding data to check egressions of #726 --- features/data/loop_small.osm | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 features/data/loop_small.osm diff --git a/features/data/loop_small.osm b/features/data/loop_small.osm new file mode 100644 index 000000000..ea5ac69f3 --- /dev/null +++ b/features/data/loop_small.osm @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6893df91037d840486ee5cd1fdc6fb13185cbd7d Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 2 Oct 2013 11:38:09 +0200 Subject: [PATCH 06/36] replacing c-style numeric limits with proper C++ style --- DataStructures/StaticRTree.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index a90414a24..60629ac06 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -599,8 +599,8 @@ public: ) { bool ignore_tiny_components = (zoom_level <= 14); DataT nearest_edge; - double min_dist = DBL_MAX; - double min_max_dist = DBL_MAX; + double min_dist = std::numeric_limits::max(); + double min_max_dist = std::numeric_limits::max(); bool found_a_nearest_edge = false; //initialize queue with root element @@ -711,8 +711,8 @@ public: uint32_t io_count = 0; uint32_t explored_tree_nodes_count = 0; //SimpleLogger().Write() << "searching for coordinate " << input_coordinate; - double min_dist = DBL_MAX; - double min_max_dist = DBL_MAX; + double min_dist = std::numeric_limits::max(); + double min_max_dist = std::numeric_limits::max(); bool found_a_nearest_edge = false; FixedPointCoordinate nearest, current_start_coordinate, current_end_coordinate; From 52f6e149ecf586f62041456f724188224a77c65e Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 2 Oct 2013 11:40:05 +0200 Subject: [PATCH 07/36] removing debug output --- DataStructures/StaticRTree.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 60629ac06..7b72203af 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -741,7 +741,6 @@ public: LeafNode current_leaf_node; LoadLeafFromDisk(current_tree_node.children[0], current_leaf_node); ++io_count; - SimpleLogger().Write() << "checking " << current_leaf_node.object_count << " elements"; for(uint32_t i = 0; i < current_leaf_node.object_count; ++i) { DataT & current_edge = current_leaf_node.objects[i]; if(ignore_tiny_components && current_edge.belongsToTinyComponent) { @@ -760,8 +759,6 @@ public: ¤t_ratio ); - SimpleLogger().Write() << "Checking edge " << current_edge.id << " at dist: " << current_perpendicular_distance; - if( current_perpendicular_distance < min_dist && !DoubleEpsilonCompare( @@ -769,9 +766,6 @@ public: min_dist ) ) { //found a new minimum - SimpleLogger().Write() << "diff: " << std::setprecision(10) << std::fabs(current_perpendicular_distance - min_dist); - SimpleLogger().Write() << (DoubleEpsilonCompare(current_perpendicular_distance, min_dist) ? "same" : "different"); - SimpleLogger().Write() << std::setprecision(6) << "old min: " << min_dist << ", new min: " << current_perpendicular_distance; min_dist = current_perpendicular_distance; result_phantom_node.edgeBasedNode = current_edge.id; result_phantom_node.nodeBasedEdgeNameID = current_edge.nameID; @@ -802,15 +796,12 @@ public: ) { BOOST_ASSERT_MSG(current_edge.id != result_phantom_node.edgeBasedNode, "IDs not different"); - SimpleLogger().Write() << "found bidirected edge on nodes " << current_edge.id << " and " << result_phantom_node.edgeBasedNode; result_phantom_node.weight2 = current_edge.weight; if(current_edge.id < result_phantom_node.edgeBasedNode) { result_phantom_node.edgeBasedNode = current_edge.id; std::swap(result_phantom_node.weight1, result_phantom_node.weight2); std::swap(current_end_coordinate, current_start_coordinate); - // SimpleLogger().Write() <<"case 2"; } - //SimpleLogger().Write() << "w1: " << result_phantom_node.weight1 << ", w2: " << result_phantom_node.weight2; } } } else { From 3f80f52ca552ff3b4b753e2dc1264baa3d2a1a6b Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 2 Oct 2013 11:57:34 +0200 Subject: [PATCH 08/36] refactoring some variable names --- Algorithms/DouglasPeucker.h | 111 +++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 39 deletions(-) diff --git a/Algorithms/DouglasPeucker.h b/Algorithms/DouglasPeucker.h index 5de5fbd7e..dd910b9c8 100644 --- a/Algorithms/DouglasPeucker.h +++ b/Algorithms/DouglasPeucker.h @@ -23,9 +23,11 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "../DataStructures/Coordinate.h" -#include +#include + #include -#include + +#include #include #include @@ -45,7 +47,7 @@ class DouglasPeucker { private: typedef std::pair PairOfPoints; //Stack to simulate the recursion - std::stack recursionStack; + std::stack recursion_stack; /** * This distance computation does integer arithmetic only and is about twice as fast as @@ -56,12 +58,13 @@ private: const int p2x = (segB.lon - segA.lat); const int p2y = (segB.lon - segA.lat); const int something = p2x*p2x + p2y*p2y; - int u = (something < FLT_EPSILON ? 0 : ((point.lon - segA.lon) * p2x + (point.lat - segA.lat) * p2y) / something); + int u = ( 0 == something ? 0 : ((point.lon - segA.lon) * p2x + (point.lat - segA.lat) * p2y) / something); - if (u > 1) + if (u > 1) { u = 1; - else if (u < 0) + } else if (u < 0) { u = 0; + } const int x = segA.lon + u * p2x; const int y = segA.lat + u * p2y; @@ -76,52 +79,82 @@ private: public: - void Run(std::vector & inputVector, const unsigned zoomLevel) { + void Run(std::vector & input_geometry, const unsigned zoom_level) { { - assert(zoomLevel < 19); - assert(1 < inputVector.size()); - std::size_t leftBorderOfRange = 0; - std::size_t rightBorderOfRange = 1; + BOOST_ASSERT_MSG(zoom_level < 19, "unsupported zoom level"); + BOOST_ASSERT_MSG(1 < input_geometry.size(), "geometry invalid"); + std::size_t left_border = 0; + std::size_t right_border = 1; //Sweep linerarily over array and identify those ranges that need to be checked -// recursionStack.hint(inputVector.size()); do { - assert(inputVector[leftBorderOfRange].necessary); - assert(inputVector.back().necessary); + BOOST_ASSERT_MSG( + input_geometry[left_border].necessary, + "left border must be necessary" + ); + BOOST_ASSERT_MSG( + input_geometry.back().necessary, + "right border must be necessary" + ); - if(inputVector[rightBorderOfRange].necessary) { - recursionStack.push(std::make_pair(leftBorderOfRange, rightBorderOfRange)); - leftBorderOfRange = rightBorderOfRange; + if(input_geometry[right_border].necessary) { + recursion_stack.push(std::make_pair(left_border, right_border)); + left_border = right_border; } - ++rightBorderOfRange; - } while( rightBorderOfRange < inputVector.size()); + ++right_border; + } while( right_border < input_geometry.size()); } - while(!recursionStack.empty()) { + while(!recursion_stack.empty()) { //pop next element - const PairOfPoints pair = recursionStack.top(); - recursionStack.pop(); - assert(inputVector[pair.first].necessary); - assert(inputVector[pair.second].necessary); - assert(pair.second < inputVector.size()); - assert(pair.first < pair.second); - int maxDistance = INT_MIN; + const PairOfPoints pair = recursion_stack.top(); + recursion_stack.pop(); + BOOST_ASSERT_MSG( + input_geometry[pair.first].necessary, + "left border mus be necessary" + ); + BOOST_ASSERT_MSG( + input_geometry[pair.second].necessary, + "right border must be necessary" + ); + BOOST_ASSERT_MSG( + pair.second < input_geometry.size(), + "right border outside of geometry" + ); + BOOST_ASSERT_MSG( + pair.first < pair.second, + "left border on the wrong side" + ); + int max_distance = INT_MIN; - std::size_t indexOfFarthestElement = pair.second; - //find index idx of element with maxDistance + std::size_t farthest_element_index = pair.second; + //find index idx of element with max_distance for(std::size_t i = pair.first+1; i < pair.second; ++i){ - const double distance = std::fabs(fastDistance(inputVector[i].location, inputVector[pair.first].location, inputVector[pair.second].location)); - if(distance > DouglasPeuckerThresholds[zoomLevel] && distance > maxDistance) { - indexOfFarthestElement = i; - maxDistance = distance; + const int temp_dist = fastDistance( + input_geometry[i].location, + input_geometry[pair.first].location, + input_geometry[pair.second].location + ); + const double distance = std::fabs(temp_dist); + if( + distance > DouglasPeuckerThresholds[zoom_level] && + distance > max_distance + ) { + farthest_element_index = i; + max_distance = distance; } } - if (maxDistance > DouglasPeuckerThresholds[zoomLevel]) { + if (max_distance > DouglasPeuckerThresholds[zoom_level]) { // mark idx as necessary - inputVector[indexOfFarthestElement].necessary = true; - if (1 < indexOfFarthestElement - pair.first) { - recursionStack.push(std::make_pair(pair.first, indexOfFarthestElement) ); + input_geometry[farthest_element_index].necessary = true; + if (1 < (farthest_element_index - pair.first) ) { + recursion_stack.push( + std::make_pair(pair.first, farthest_element_index) + ); + } + if (1 < (pair.second - farthest_element_index) ) { + recursion_stack.push( + std::make_pair(farthest_element_index, pair.second) + ); } - if (1 < pair.second - indexOfFarthestElement) - recursionStack.push(std::make_pair(indexOfFarthestElement, pair.second) ); } } } From 770a07cc28fd7a0702b93a04e21a9de56fc36f3f Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 2 Oct 2013 12:00:25 +0200 Subject: [PATCH 09/36] replacing all occurrences of DBL_MAX --- DataStructures/StaticRTree.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 7b72203af..8118d3ab4 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -126,7 +126,7 @@ private: return 0.0; } - double min_dist = DBL_MAX; + double min_dist = std::numeric_limits::max(); min_dist = std::min( min_dist, ApproximateDistance( @@ -167,7 +167,7 @@ private: } inline double GetMinMaxDist(const FixedPointCoordinate & location) const { - double min_max_dist = DBL_MAX; + double min_max_dist = std::numeric_limits::max(); //Get minmax distance to each of the four sides FixedPointCoordinate upper_left (max_lat, min_lon); FixedPointCoordinate upper_right(max_lat, max_lon); @@ -265,7 +265,7 @@ private: const uint32_t n_id, const double dist ) : node_id(n_id), min_dist(dist) {} - QueryCandidate() : node_id(UINT_MAX), min_dist(DBL_MAX) {} + QueryCandidate() : node_id(UINT_MAX), min_dist(std::numeric_limits::max()) {} uint32_t node_id; double min_dist; inline bool operator<(const QueryCandidate & other) const { @@ -458,8 +458,8 @@ public: uint32_t io_count = 0; uint32_t explored_tree_nodes_count = 0; SimpleLogger().Write() << "searching for coordinate " << input_coordinate; - double min_dist = DBL_MAX; - double min_max_dist = DBL_MAX; + double min_dist = std::numeric_limits::max(); + double min_max_dist = std::numeric_limits::max(); bool found_a_nearest_edge = false; FixedPointCoordinate nearest, current_start_coordinate, current_end_coordinate; From bf8505a2858232ac43cdcdac0013fa8ead1cf3f6 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 2 Oct 2013 13:05:54 +0200 Subject: [PATCH 10/36] removing all FLT_EPSILONs --- Contractor/Contractor.h | 5 ++--- DataStructures/StaticRTree.h | 2 +- Descriptors/DescriptionFactory.cpp | 4 ++-- Descriptors/DescriptionFactory.h | 1 + Extractor/ExtractorCallbacks.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Contractor/Contractor.h b/Contractor/Contractor.h index 1ffc0435b..8701af625 100644 --- a/Contractor/Contractor.h +++ b/Contractor/Contractor.h @@ -38,7 +38,6 @@ or see http://www.gnu.org/licenses/agpl.txt. #include #include -#include #include #include @@ -732,7 +731,7 @@ private: if ( priority > targetPriority ) return false; //tie breaking - if ( fabs(priority - targetPriority) < FLT_EPSILON && bias(node, target) ) { + if ( fabs(priority - targetPriority) < std::numeric_limits::epsilon() && bias(node, target) ) { return false; } neighbours.push_back( target ); @@ -754,7 +753,7 @@ private: if ( priority > targetPriority) return false; //tie breaking - if ( fabs(priority - targetPriority) < FLT_EPSILON && bias(node, target) ) { + if ( fabs(priority - targetPriority) < std::numeric_limits::epsilon() && bias(node, target) ) { return false; } } diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 8118d3ab4..0be9ac107 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -467,7 +467,7 @@ public: //initialize queue with root element std::priority_queue traversal_queue; traversal_queue.push(QueryCandidate(0, m_search_tree[0].minimum_bounding_rectangle.GetMinDist(input_coordinate))); - BOOST_ASSERT_MSG(FLT_EPSILON > (0. - traversal_queue.top().min_dist), "Root element in NN Search has min dist != 0."); + BOOST_ASSERT_MSG(std::numberic_limits::epsilon() > (0. - traversal_queue.top().min_dist), "Root element in NN Search has min dist != 0."); while(!traversal_queue.empty()) { const QueryCandidate current_query_node = traversal_queue.top(); traversal_queue.pop(); diff --git a/Descriptors/DescriptionFactory.cpp b/Descriptors/DescriptionFactory.cpp index 1acf83a66..18ac015ae 100644 --- a/Descriptors/DescriptionFactory.cpp +++ b/Descriptors/DescriptionFactory.cpp @@ -166,7 +166,7 @@ void DescriptionFactory::Run(const SearchEngine &sEngine, const unsigned zoomLev // SimpleLogger().Write() << "#segs: " << pathDescription.size(); //Post-processing to remove empty or nearly empty path segments - if(FLT_EPSILON > pathDescription.back().length) { + if(std::numeric_limits::epsilon() > pathDescription.back().length) { // SimpleLogger().Write() << "#segs: " << pathDescription.size() << ", last ratio: " << targetPhantom.ratio << ", length: " << pathDescription.back().length; if(pathDescription.size() > 2){ pathDescription.pop_back(); @@ -178,7 +178,7 @@ void DescriptionFactory::Run(const SearchEngine &sEngine, const unsigned zoomLev } else { pathDescription[indexOfSegmentBegin].duration *= (1.-targetPhantom.ratio); } - if(FLT_EPSILON > pathDescription[0].length) { + if(std::numeric_limits::epsilon() > pathDescription[0].length) { //TODO: this is never called actually? if(pathDescription.size() > 2) { pathDescription.erase(pathDescription.begin()); diff --git a/Descriptors/DescriptionFactory.h b/Descriptors/DescriptionFactory.h index 68182a881..35f0ff172 100644 --- a/Descriptors/DescriptionFactory.h +++ b/Descriptors/DescriptionFactory.h @@ -30,6 +30,7 @@ #include "../Util/SimpleLogger.h" #include "../typedefs.h" +#include #include /* This class is fed with all way segments in consecutive order diff --git a/Extractor/ExtractorCallbacks.cpp b/Extractor/ExtractorCallbacks.cpp index e0a4763ef..4331f8dc8 100644 --- a/Extractor/ExtractorCallbacks.cpp +++ b/Extractor/ExtractorCallbacks.cpp @@ -56,7 +56,7 @@ void ExtractorCallbacks::wayFunction(ExtractionWay &parsed_way) { parsed_way.speed = parsed_way.duration/(parsed_way.path.size()-1); } - if(FLT_EPSILON >= fabs(-1. - parsed_way.speed)){ + if(std::numeric_limits::epsilon() >= fabs(-1. - parsed_way.speed)){ SimpleLogger().Write(logDEBUG) << "found way with bogus speed, id: " << parsed_way.id; return; From 20f321347708f89d9d7c32548177ad03a04823e2 Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Wed, 2 Oct 2013 13:43:07 +0200 Subject: [PATCH 11/36] test projection onto ways at high lat --- features/testbot/projection.feature | 37 +++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 features/testbot/projection.feature diff --git a/features/testbot/projection.feature b/features/testbot/projection.feature new file mode 100644 index 000000000..daf293fa6 --- /dev/null +++ b/features/testbot/projection.feature @@ -0,0 +1,37 @@ +@routing @projection +Feature: Projection to nearest point on road + + Background: + The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html + The nodes are placed as follows, with ab, bc and bd all being 1 km in length each: + | | | c | | + | | b | | (this is sketch only, real data is in the table below) | + | a | | d | | + + Given the profile "testbot" + Given the node locations + | node | lat | lon | + | a | 80.00000 | 0.00000 | + | b | 80.00639 | 0.03667 | + | c | 80.01278 | 0.07333 | + | d | 80.00000 | 0.07333 | + + And the ways + | nodes | + | abc | + + Scenario: Projection onto way at high latitudes, 1km distance + When I route I should get + | from | to | route | compass | bearing | distance | + | b | a | abc | SW | 225 | 1000m +-3 | + | b | c | abc | NE | 45 | 1000m +-3 | + | a | d | abc | NE | 45 | 1000m +-3 | + | d | a | abc | SW | 225 | 1000m +-3 | + | c | d | abc | SW | 225 | 1000m +-3 | + | d | c | abc | NE | 45 | 1000m +-3 | + + Scenario: Projection onto way at high latitudes, no distance + When I route I should get + | from | to | route | distance | + | d | b | abc | 0m | + | b | d | abc | 0m | From 9bcc05717600bfc34e31ee00d91be12d75b03d65 Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Wed, 2 Oct 2013 13:48:49 +0200 Subject: [PATCH 12/36] mark projection tests as todo --- features/testbot/projection.feature | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/features/testbot/projection.feature b/features/testbot/projection.feature index daf293fa6..069279dff 100644 --- a/features/testbot/projection.feature +++ b/features/testbot/projection.feature @@ -1,5 +1,6 @@ -@routing @projection +@routing @projection @todo Feature: Projection to nearest point on road +Waypoints should be projected perpendicular onto the closest road, also at high latitudes. Background: The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html From 96184b83a349c56ee2c61a400177d3332fbf22d1 Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Wed, 2 Oct 2013 13:53:09 +0200 Subject: [PATCH 13/36] minor whitespace cleanup --- features/testbot/projection.feature | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/features/testbot/projection.feature b/features/testbot/projection.feature index 069279dff..6d94480dc 100644 --- a/features/testbot/projection.feature +++ b/features/testbot/projection.feature @@ -5,10 +5,10 @@ Waypoints should be projected perpendicular onto the closest road, also at high Background: The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html The nodes are placed as follows, with ab, bc and bd all being 1 km in length each: - | | | c | | - | | b | | (this is sketch only, real data is in the table below) | - | a | | d | | - + | | | c | + | | b | | (this is sketch only, real data is in the table below) + | a | | d | + Given the profile "testbot" Given the node locations | node | lat | lon | From d3804d2c2cadba4926f1f396cc266d1f51164dd4 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 2 Oct 2013 14:39:52 +0200 Subject: [PATCH 14/36] replacing hard coded values by literal --- DataStructures/StaticRTree.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 0be9ac107..97e88130a 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -878,12 +878,12 @@ private: const FixedPointCoordinate& source, const FixedPointCoordinate& target, FixedPointCoordinate& nearest, double *r) const { - const double x = inputPoint.lat/100000.; - const double y = inputPoint.lon/100000.; - const double a = source.lat/100000.; - const double b = source.lon/100000.; - const double c = target.lat/100000.; - const double d = target.lon/100000.; + const double x = inputPoint.lat/COORDINATE_PRECISION; + const double y = inputPoint.lon/COORDINATE_PRECISION; + const double a = source.lat/COORDINATE_PRECISION; + const double b = source.lon/COORDINATE_PRECISION; + const double c = target.lat/COORDINATE_PRECISION; + const double d = target.lon/COORDINATE_PRECISION; double p,q,mX,nY; if(std::fabs(a-c) > std::numeric_limits::epsilon() ){ const double m = (d-b)/(c-a); // slope @@ -915,8 +915,8 @@ private: // return std::sqrt(((d - y)*(d - y) + (c - x)*(c - x))); } // point lies in between - nearest.lat = p*100000.; - nearest.lon = q*100000.; + nearest.lat = p*COORDINATE_PRECISION; + nearest.lon = q*COORDINATE_PRECISION; // return std::sqrt((p-x)*(p-x) + (q-y)*(q-y)); return (p-x)*(p-x) + (q-y)*(q-y); } From a354d7c00b996736f3d3d73ec1cd21a2a9478714 Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Wed, 2 Oct 2013 19:28:41 +0200 Subject: [PATCH 15/36] use testbot for testing for weird loops --- features/{car => testbot}/loop.feature | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) rename features/{car => testbot}/loop.feature (83%) diff --git a/features/car/loop.feature b/features/testbot/loop.feature similarity index 83% rename from features/car/loop.feature rename to features/testbot/loop.feature index 8eb378da5..55c3cdaff 100644 --- a/features/car/loop.feature +++ b/features/testbot/loop.feature @@ -1,10 +1,10 @@ -@routing @loop -Feature: Weird routings discovered +@routing @726 +Feature: Avoid weird loops caused by rounding errors Background: - Given the profile "car" + Given the profile "testbot" - Scenario: Weird looping, small input file + Scenario: Avoid weird loops, small input file Given the input file features/data/loop_small.osm And the node locations @@ -16,8 +16,7 @@ Feature: Weird routings discovered | from | to | route | turns | | a | b | Artillerivej | head,destination | - @a - Scenario: Weird looping, manual input + Scenario: Avoid weird loops, manual input Given the node locations | node | lat | lon | | a | 55.660778 | 12.573909 | From f83748fdc2d29b99e7b25e9fb16b38d9f7e62e7b Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Wed, 2 Oct 2013 20:07:53 +0200 Subject: [PATCH 16/36] change test file to cuke table --- features/data/loop_small.osm | 47 ----------------------------------- features/testbot/loop.feature | 33 +++++++++++++++++------- 2 files changed, 24 insertions(+), 56 deletions(-) delete mode 100644 features/data/loop_small.osm diff --git a/features/data/loop_small.osm b/features/data/loop_small.osm deleted file mode 100644 index ea5ac69f3..000000000 --- a/features/data/loop_small.osm +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/features/testbot/loop.feature b/features/testbot/loop.feature index 55c3cdaff..a67af6217 100644 --- a/features/testbot/loop.feature +++ b/features/testbot/loop.feature @@ -4,19 +4,34 @@ Feature: Avoid weird loops caused by rounding errors Background: Given the profile "testbot" - Scenario: Avoid weird loops, small input file - Given the input file features/data/loop_small.osm + Scenario: Avoid weird loops 1 + Given the node locations + | node | lat | lon | + | a | 55.6602463 | 12.5717242 | + | b | 55.6600270 | 12.5723008 | + | c | 55.6601840 | 12.5725037 | + | d | 55.6604146 | 12.5719299 | + | e | 55.6599410 | 12.5727592 | + | f | 55.6606727 | 12.5736932 | + | g | 55.6603422 | 12.5732619 | + | h | 55.6607785 | 12.5739097 | + | i | 55.6600566 | 12.5725070 | + | x | 55.6608180 | 12.5740510 | + | y | 55.6600730 | 12.5740670 | - And the node locations - | node | lat | lon | - | a | 55.660818 | 12.574051 | - | b | 55.660073 | 12.574067 | + And the ways + | nodes | + | ab | + | hfgd | + | icd | + | ad | + | ie | When I route I should get - | from | to | route | turns | - | a | b | Artillerivej | head,destination | + | from | to | route | turns | + | x | y | hfgd | head,destination | - Scenario: Avoid weird loops, manual input + Scenario: Avoid weird loops 2 Given the node locations | node | lat | lon | | a | 55.660778 | 12.573909 | From 32719690ac7cb39717d3476b38511189197ebdc6 Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Wed, 2 Oct 2013 20:09:36 +0200 Subject: [PATCH 17/36] update ruby gems used for cucumber testing --- Gemfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 32a3fdada..ac056a0a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,23 +1,23 @@ GEM remote: http://rubygems.org/ specs: - builder (3.0.0) - cucumber (1.1.4) + builder (3.2.2) + cucumber (1.3.8) builder (>= 2.1.2) - diff-lcs (>= 1.1.2) - gherkin (~> 2.7.1) - json (>= 1.4.6) - term-ansicolor (>= 1.0.6) - diff-lcs (1.1.3) - gherkin (2.7.6) - json (>= 1.4.6) - json (1.6.5) + diff-lcs (>= 1.1.3) + gherkin (~> 2.12.1) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.0.2) + diff-lcs (1.2.4) + gherkin (2.12.1) + multi_json (~> 1.3) + multi_json (1.8.0) + multi_test (0.0.2) osmlib-base (0.1.4) - rake (0.9.2.2) - rspec-expectations (2.11.3) - diff-lcs (~> 1.1.3) - sys-proctable (0.9.1) - term-ansicolor (1.0.7) + rake (10.1.0) + rspec-expectations (2.14.3) + diff-lcs (>= 1.1.3, < 2.0) + sys-proctable (0.9.3) PLATFORMS ruby From 65df6aa4a0eac969817e0de56a3bfd616106e5ee Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Fri, 4 Oct 2013 13:31:15 +0200 Subject: [PATCH 18/36] failing test showing weird loop, issue 412 --- features/testbot/loop.feature | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/features/testbot/loop.feature b/features/testbot/loop.feature index a67af6217..bb4f28161 100644 --- a/features/testbot/loop.feature +++ b/features/testbot/loop.feature @@ -50,3 +50,29 @@ Feature: Avoid weird loops caused by rounding errors When I route I should get | from | to | route | turns | | x | y | abc | head,destination | + + @bug @412 + Scenario: Avoid weird loops 3 + And the node map + | a | | | + | b | e | | + | | | 1 | + | | | | + | | | 2 | + | | | | + | | c | f | + | | d | | + + And the ways + | nodes | highway | + | ab | primary | + | bc | primary | + | cd | primary | + | be | secondary | + | ef | secondary | + | cf | secondary | + + When I route I should get + | waypoints | route | turns | + | a,2,d | ab,be,ef,cf,cd | head,left,right,right,left,destination | + | a,1,d | ab,be,ef,cf,cd | head,left,right,right,left,destination | From 822c1c97e3a9efa31df0d7d50368e6def30a0dd4 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 4 Oct 2013 16:47:59 +0200 Subject: [PATCH 19/36] fixing #412, wrong offsets cause supoptimal routes with via points --- features/testbot/loop.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/testbot/loop.feature b/features/testbot/loop.feature index bb4f28161..eb5b45e66 100644 --- a/features/testbot/loop.feature +++ b/features/testbot/loop.feature @@ -51,7 +51,7 @@ Feature: Avoid weird loops caused by rounding errors | from | to | route | turns | | x | y | abc | head,destination | - @bug @412 + @412 Scenario: Avoid weird loops 3 And the node map | a | | | From 061ebc794280295defd9f90eb0899efde3cf6037 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 4 Oct 2013 17:10:40 +0200 Subject: [PATCH 20/36] fixing #412, wrong offsets cause supoptimal routes with via points --- RoutingAlgorithms/ShortestPathRouting.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RoutingAlgorithms/ShortestPathRouting.h b/RoutingAlgorithms/ShortestPathRouting.h index dc69ed31f..fe6ad5e65 100644 --- a/RoutingAlgorithms/ShortestPathRouting.h +++ b/RoutingAlgorithms/ShortestPathRouting.h @@ -72,15 +72,15 @@ public: //insert new starting nodes into forward heap, adjusted by previous distances. if(searchFrom1stStartNode) { - forward_heap1.Insert(phantomNodePair.startPhantom.edgeBasedNode, -phantomNodePair.startPhantom.weight1, phantomNodePair.startPhantom.edgeBasedNode); + forward_heap1.Insert(phantomNodePair.startPhantom.edgeBasedNode, distance1-phantomNodePair.startPhantom.weight1, phantomNodePair.startPhantom.edgeBasedNode); // INFO("fw1: " << phantomNodePair.startPhantom.edgeBasedNode << "´, w: " << -phantomNodePair.startPhantom.weight1); - forward_heap2.Insert(phantomNodePair.startPhantom.edgeBasedNode, -phantomNodePair.startPhantom.weight1, phantomNodePair.startPhantom.edgeBasedNode); + forward_heap2.Insert(phantomNodePair.startPhantom.edgeBasedNode, distance1-phantomNodePair.startPhantom.weight1, phantomNodePair.startPhantom.edgeBasedNode); // INFO("fw2: " << phantomNodePair.startPhantom.edgeBasedNode << "´, w: " << -phantomNodePair.startPhantom.weight1); } if(phantomNodePair.startPhantom.isBidirected() && searchFrom2ndStartNode) { - forward_heap1.Insert(phantomNodePair.startPhantom.edgeBasedNode+1, -phantomNodePair.startPhantom.weight2, phantomNodePair.startPhantom.edgeBasedNode+1); + forward_heap1.Insert(phantomNodePair.startPhantom.edgeBasedNode+1, distance2-phantomNodePair.startPhantom.weight2, phantomNodePair.startPhantom.edgeBasedNode+1); // INFO("fw1: " << phantomNodePair.startPhantom.edgeBasedNode+1 << "´, w: " << -phantomNodePair.startPhantom.weight2); - forward_heap2.Insert(phantomNodePair.startPhantom.edgeBasedNode+1, -phantomNodePair.startPhantom.weight2, phantomNodePair.startPhantom.edgeBasedNode+1); + forward_heap2.Insert(phantomNodePair.startPhantom.edgeBasedNode+1, distance2-phantomNodePair.startPhantom.weight2, phantomNodePair.startPhantom.edgeBasedNode+1); // INFO("fw2: " << phantomNodePair.startPhantom.edgeBasedNode+1 << "´, w: " << -phantomNodePair.startPhantom.weight2); } From 411bcbcbde656bd11eb2a2ddd9b7f01576c7e056 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Fri, 11 Oct 2013 14:55:34 +0200 Subject: [PATCH 21/36] remove debug output --- DataStructures/StaticRTree.h | 1 - 1 file changed, 1 deletion(-) diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 97e88130a..522019073 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -824,7 +824,6 @@ public: traversal_queue.push(QueryCandidate(child_id, current_min_dist)); } } - SimpleLogger().Write() << result_phantom_node; } } From b80cda66a9d443fdeb99b2f95539e758ee438a0e Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Fri, 11 Oct 2013 14:58:19 +0200 Subject: [PATCH 22/36] fixes issue #755 --- RoutingAlgorithms/ShortestPathRouting.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/RoutingAlgorithms/ShortestPathRouting.h b/RoutingAlgorithms/ShortestPathRouting.h index fe6ad5e65..f2a3d559d 100644 --- a/RoutingAlgorithms/ShortestPathRouting.h +++ b/RoutingAlgorithms/ShortestPathRouting.h @@ -160,11 +160,9 @@ public: if( *(packedPath1.end()-1) == *(temporaryPackedPath1.begin())) { packedPath2.clear(); packedPath2.insert(packedPath2.end(), packedPath1.begin(), packedPath1.end()); - distance2 = distance1; } else { packedPath1.clear(); packedPath1.insert(packedPath1.end(), packedPath2.begin(), packedPath2.end()); - distance1 = distance2; } } else { //packed paths 1 and 2 may need to switch. @@ -184,8 +182,8 @@ public: searchFrom2ndStartNode &= !(lastNodeID == phantomNodePair.targetPhantom.edgeBasedNode); } - distance1 += _localUpperbound1; - distance2 += _localUpperbound2; + distance1 = _localUpperbound1; + distance2 = _localUpperbound2; } if(distance1 > distance2){ From 613e38d7f8c505eafd15e3d836002edab0e9ea4d Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Mon, 19 Aug 2013 22:41:46 +0200 Subject: [PATCH 23/36] use boost program_options in osrm-prepare/routed --- CMakeLists.txt | 4 +- Library/OSRM.cpp | 71 +-------- Library/OSRM.h | 4 +- Rakefile | 50 ++---- Server/DataStructures/QueryObjectsStorage.cpp | 45 +++--- Server/DataStructures/QueryObjectsStorage.h | 11 +- Server/ServerFactory.h | 33 +--- Tools/componentAnalysis.cpp | 1 - Util/ProgramOptions.h | 5 + contractor.ini | 1 - createHierarchy.cpp | 139 ++++++++++++----- extractor.cpp | 8 +- features/step_definitions/locate.rb | 2 +- features/step_definitions/nearest.rb | 2 +- features/step_definitions/requests.rb | 2 +- features/step_definitions/routability.rb | 2 +- features/step_definitions/routing.rb | 2 +- features/support/config.rb | 18 --- features/support/data.rb | 3 +- features/support/file.rb | 2 + features/support/launch.rb | 5 +- routed.cpp | 143 +++++++++++++++++- server.ini | 11 -- test/contractor.ini | 1 - 24 files changed, 296 insertions(+), 269 deletions(-) delete mode 100644 contractor.ini delete mode 100644 server.ini delete mode 100644 test/contractor.ini diff --git a/CMakeLists.txt b/CMakeLists.txt index 62030dfd9..d4d66f368 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,10 +38,10 @@ set(ExtractorSources extractor.cpp ${ExtractorGlob} Util/GitDescription.cpp) add_executable(osrm-extract ${ExtractorSources} ) file(GLOB PrepareGlob Contractor/*.cpp) -set(PrepareSources createHierarchy.cpp ${PrepareGlob}) +set(PrepareSources createHierarchy.cpp ${PrepareGlob} Util/GitDescription.cpp) add_executable(osrm-prepare ${PrepareSources} ) -add_executable(osrm-routed routed.cpp ) +add_executable(osrm-routed routed.cpp Util/GitDescription.cpp) set_target_properties(osrm-routed PROPERTIES COMPILE_FLAGS -DROUTED) file(GLOB DescriptorGlob Descriptors/*.cpp) diff --git a/Library/OSRM.cpp b/Library/OSRM.cpp index 79f6b869f..3c56ac6cd 100644 --- a/Library/OSRM.cpp +++ b/Library/OSRM.cpp @@ -19,76 +19,11 @@ or see http://www.gnu.org/licenses/agpl.txt. */ #include "OSRM.h" +#include -OSRM::OSRM(const char * server_ini_path) { - if( !testDataFile(server_ini_path) ){ - std::string error_message = std::string(server_ini_path) + " not found"; - throw OSRMException(error_message.c_str()); - } - - IniFile serverConfig(server_ini_path); - - boost::filesystem::path base_path = - boost::filesystem::absolute(server_ini_path).parent_path(); - - if ( !serverConfig.Holds("hsgrData")) { - throw OSRMException("no ram index file name in server ini"); - } - if ( !serverConfig.Holds("ramIndex") ) { - throw OSRMException("no mem index file name in server ini"); - } - if ( !serverConfig.Holds("fileIndex") ) { - throw OSRMException("no nodes file name in server ini"); - } - if ( !serverConfig.Holds("nodesData") ) { - throw OSRMException("no nodes file name in server ini"); - } - if ( !serverConfig.Holds("edgesData") ) { - throw OSRMException("no edges file name in server ini"); - } - - boost::filesystem::path hsgr_path = boost::filesystem::absolute( - serverConfig.GetParameter("hsgrData"), - base_path - ); - - boost::filesystem::path ram_index_path = boost::filesystem::absolute( - serverConfig.GetParameter("ramIndex"), - base_path - ); - - boost::filesystem::path file_index_path = boost::filesystem::absolute( - serverConfig.GetParameter("fileIndex"), - base_path - ); - - boost::filesystem::path node_data_path = boost::filesystem::absolute( - serverConfig.GetParameter("nodesData"), - base_path - ); - boost::filesystem::path edge_data_path = boost::filesystem::absolute( - serverConfig.GetParameter("edgesData"), - base_path - ); - boost::filesystem::path name_data_path = boost::filesystem::absolute( - serverConfig.GetParameter("namesData"), - base_path - ); - boost::filesystem::path timestamp_path = boost::filesystem::absolute( - serverConfig.GetParameter("timestamp"), - base_path - ); - - objects = new QueryObjectsStorage( - hsgr_path.string(), - ram_index_path.string(), - file_index_path.string(), - node_data_path.string(), - edge_data_path.string(), - name_data_path.string(), - timestamp_path.string() - ); +OSRM::OSRM(boost::unordered_map& paths) { + objects = new QueryObjectsStorage( paths ); RegisterPlugin(new HelloWorldPlugin()); RegisterPlugin(new LocatePlugin(objects)); RegisterPlugin(new NearestPlugin(objects)); diff --git a/Library/OSRM.h b/Library/OSRM.h index bb3caa7d9..515bfd3ed 100644 --- a/Library/OSRM.h +++ b/Library/OSRM.h @@ -30,9 +30,9 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "../Plugins/TimestampPlugin.h" #include "../Plugins/ViaRoutePlugin.h" #include "../Server/DataStructures/RouteParameters.h" -#include "../Util/IniFile.h" #include "../Util/InputFileUtil.h" #include "../Util/OSRMException.h" +#include "../Util/ProgramOptions.h" #include "../Util/SimpleLogger.h" #include "../Server/BasicDatastructures.h" @@ -47,7 +47,7 @@ class OSRM : boost::noncopyable { typedef boost::unordered_map PluginMap; QueryObjectsStorage * objects; public: - OSRM(const char * server_ini_path); + OSRM(boost::unordered_map& paths); ~OSRM(); void RunQuery(RouteParameters & route_parameters, http::Reply & reply); private: diff --git a/Rakefile b/Rakefile index ed0b48bab..21e95cfb2 100644 --- a/Rakefile +++ b/Rakefile @@ -59,23 +59,6 @@ def wait_for_shutdown name raise "*** Could not terminate #{name}." end -def write_server_ini osm_file - s=<<-EOF - Threads = 1 - IP = 0.0.0.0 - Port = #{OSRM_PORT} - - hsgrData=#{osm_file}.osrm.hsgr - nodesData=#{osm_file}.osrm.nodes - edgesData=#{osm_file}.osrm.edges - ramIndex=#{osm_file}.osrm.ramIndex - fileIndex=#{osm_file}.osrm.fileIndex - namesData=#{osm_file}.osrm.names - timestamp=#{osm_file}.osrm.timestamp - EOF - File.open( 'server.ini', 'w') {|f| f.write( s ) } -end - desc "Rebuild and run tests." task :default => [:build] @@ -93,17 +76,10 @@ end desc "Setup config files." task :setup do - Dir.mkdir "#{DATA_FOLDER}" unless File.exist? "#{DATA_FOLDER}" - ['server.ini','extractor.ini','contractor.ini'].each do |file| - unless File.exist? "#{DATA_FOLDER}/#{file}" - puts "Copying #{file} template to #{DATA_FOLDER}/#{file}" - FileUtils.cp file, "#{DATA_FOLDER}/#{file}" - end - end end desc "Download OSM data." -task :download => :setup do +task :download do Dir.mkdir "#{DATA_FOLDER}" unless File.exist? "#{DATA_FOLDER}" puts "Downloading..." puts "curl http://download.geofabrik.de/europe/#{osm_data_country}-latest.osm.pbf -o #{DATA_FOLDER}/#{osm_data_country}.osm.pbf" @@ -122,26 +98,20 @@ task :crop do end desc "Reprocess OSM data." -task :process => :setup do - Dir.chdir DATA_FOLDER do - raise "Error while extracting data." unless system "../#{BUILD_FOLDER}/osrm-extract #{osm_data_area_name}.osm.pbf --profile #{PROFILES_FOLDER}/#{PROFILE}.lua" - puts - raise "Error while preparing data." unless system "../#{BUILD_FOLDER}/osrm-prepare #{osm_data_area_name}.osrm #{osm_data_area_name}.osrm.restrictions #{PROFILES_FOLDER}/#{PROFILE}.lua" - puts - end +task :process => [:extract,:prepare] do end desc "Extract OSM data." -task :extract => :setup do +task :extract do Dir.chdir DATA_FOLDER do raise "Error while extracting data." unless system "../#{BUILD_FOLDER}/osrm-extract #{osm_data_area_name}.osm.pbf --profile ../profiles/#{PROFILE}.lua" end end desc "Prepare OSM data." -task :prepare => :setup do +task :prepare do Dir.chdir DATA_FOLDER do - raise "Error while preparing data." unless system "../#{BUILD_FOLDER}/osrm-prepare #{osm_data_area_name}.osrm #{osm_data_area_name}.osrm.restrictions ../profiles/#{PROFILE}.lua" + raise "Error while preparing data." unless system "../#{BUILD_FOLDER}/osrm-prepare #{osm_data_area_name}.osrm --profile ../profiles/#{PROFILE}.lua" end end @@ -158,19 +128,17 @@ task :test do end desc "Run the routing server in the terminal. Press Ctrl-C to stop." -task :run => :setup do +task :run do Dir.chdir DATA_FOLDER do - write_server_ini osm_data_area_name - system "../#{BUILD_FOLDER}/osrm-routed" + system "../#{BUILD_FOLDER}/osrm-routed #{osm_data_area_name}.osrm --port #{OSRM_PORT}" end end desc "Launch the routing server in the background. Use rake:down to stop it." -task :up => :setup do +task :up do Dir.chdir DATA_FOLDER do abort("Already up.") if up? - write_server_ini osm_data_area_name - pipe = IO.popen("../#{BUILD_FOLDER}/osrm-routed 1>>osrm-routed.log 2>>osrm-routed.log") + pipe = IO.popen("../#{BUILD_FOLDER}/osrm-routed #{osm_data_area_name}.osrm --port #{OSRM_PORT} 1>>osrm-routed.log 2>>osrm-routed.log") timeout = 5 (timeout*10).times do begin diff --git a/Server/DataStructures/QueryObjectsStorage.cpp b/Server/DataStructures/QueryObjectsStorage.cpp index e0ec72e40..d7c22ef47 100644 --- a/Server/DataStructures/QueryObjectsStorage.cpp +++ b/Server/DataStructures/QueryObjectsStorage.cpp @@ -21,31 +21,23 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "QueryObjectsStorage.h" -QueryObjectsStorage::QueryObjectsStorage( - const std::string & hsgr_path, - const std::string & ram_index_path, - const std::string & file_index_path, - const std::string & nodes_path, - const std::string & edges_path, - const std::string & names_path, - const std::string & timestamp_path -) { - if( hsgr_path.empty() ) { +QueryObjectsStorage::QueryObjectsStorage(boost::unordered_map& paths) { + if( paths["hsgr"].empty() ) { throw OSRMException("no hsgr file given in ini file"); } - if( ram_index_path.empty() ) { + if( paths["ramIndex"].empty() ) { throw OSRMException("no ram index file given in ini file"); } - if( file_index_path.empty() ) { + if( paths["fileIndex"].empty() ) { throw OSRMException("no mem index file given in ini file"); } - if( nodes_path.empty() ) { + if( paths["nodes"].empty() ) { throw OSRMException("no nodes file given in ini file"); } - if( edges_path.empty() ) { + if( paths["edges"].empty() ) { throw OSRMException("no edges file given in ini file"); } - if( names_path.empty() ) { + if( paths["names"].empty() ) { throw OSRMException("no names file given in ini file"); } @@ -54,7 +46,7 @@ QueryObjectsStorage::QueryObjectsStorage( std::vector< QueryGraph::_StrNode> node_list; std::vector< QueryGraph::_StrEdge> edge_list; const int number_of_nodes = readHSGRFromStream( - hsgr_path, + paths["hsgr"].c_str(), node_list, edge_list, &check_sum @@ -65,11 +57,11 @@ QueryObjectsStorage::QueryObjectsStorage( assert(0 == node_list.size()); assert(0 == edge_list.size()); - if(timestamp_path.length()) { + if(!paths["timestamp"].empty()) { SimpleLogger().Write() << "Loading Timestamp"; - std::ifstream timestampInStream(timestamp_path.c_str()); + std::ifstream timestampInStream(paths["timestamp"].c_str()); if(!timestampInStream) { - SimpleLogger().Write(logWARNING) << timestamp_path << " not found"; + SimpleLogger().Write(logWARNING) << paths["timestamp"].c_str() << " not found"; } getline(timestampInStream, timestamp); @@ -85,26 +77,25 @@ QueryObjectsStorage::QueryObjectsStorage( SimpleLogger().Write() << "Loading auxiliary information"; //Init nearest neighbor data structure nodeHelpDesk = new NodeInformationHelpDesk( - ram_index_path, - file_index_path, - nodes_path, - edges_path, + paths["ramIndex"].c_str(), + paths["fileIndex"].c_str(), + paths["nodes"].c_str(), + paths["edges"].c_str(), number_of_nodes, check_sum ); //deserialize street name list SimpleLogger().Write() << "Loading names index"; - boost::filesystem::path names_file(names_path); - if ( !boost::filesystem::exists( names_file ) ) { + if ( !boost::filesystem::exists( paths["names"] ) ) { throw OSRMException("names file does not exist"); } - if ( 0 == boost::filesystem::file_size( names_file ) ) { + if ( 0 == boost::filesystem::file_size( paths["names"] ) ) { throw OSRMException("names file is empty"); } - boost::filesystem::ifstream name_stream(names_file, std::ios::binary); + boost::filesystem::ifstream name_stream(paths["names"], std::ios::binary); unsigned size = 0; name_stream.read((char *)&size, sizeof(unsigned)); BOOST_ASSERT_MSG(0 != size, "name file broken"); diff --git a/Server/DataStructures/QueryObjectsStorage.h b/Server/DataStructures/QueryObjectsStorage.h index fd5419283..a2d3a58c1 100644 --- a/Server/DataStructures/QueryObjectsStorage.h +++ b/Server/DataStructures/QueryObjectsStorage.h @@ -50,16 +50,7 @@ struct QueryObjectsStorage { void GetName(const unsigned name_id, std::string & result) const; - QueryObjectsStorage( - const std::string & hsgrPath, - const std::string & ramIndexPath, - const std::string & fileIndexPath, - const std::string & nodesPath, - const std::string & edgesPath, - const std::string & namesPath, - const std::string & timestampPath - ); - + QueryObjectsStorage(boost::unordered_map& paths); ~QueryObjectsStorage(); }; diff --git a/Server/ServerFactory.h b/Server/ServerFactory.h index 60502e257..209fe4391 100644 --- a/Server/ServerFactory.h +++ b/Server/ServerFactory.h @@ -22,46 +22,23 @@ or see http://www.gnu.org/licenses/agpl.txt. #define SERVERFACTORY_H_ #include "Server.h" -#include "../Util/IniFile.h" #include "../Util/SimpleLogger.h" #include "../Util/StringUtil.h" #include #include +#include struct ServerFactory : boost::noncopyable { - static Server * CreateServer( IniFile & serverConfig ) { - int threads = omp_get_num_procs(); - if( serverConfig.GetParameter("IP").empty() ) { - serverConfig.SetParameter("IP", "0.0.0.0"); - } - - if( serverConfig.GetParameter("Port").empty() ) { - serverConfig.SetParameter("Port", "5000"); - } - - if( - stringToInt(serverConfig.GetParameter("Threads")) >= 1 && - stringToInt(serverConfig.GetParameter("Threads")) <= threads - ) { - threads = stringToInt( serverConfig.GetParameter("Threads") ); - } + static Server * CreateServer(std::string& ip_address, int ip_port, int threads) { SimpleLogger().Write() << "http 1.1 compression handled by zlib version " << zlibVersion(); - Server * server = new Server( - serverConfig.GetParameter("IP"), - serverConfig.GetParameter("Port"), - threads - ); - return server; - } - - static Server * CreateServer(const char * iniFile) { - IniFile serverConfig(iniFile); - return CreateServer(serverConfig); + std::stringstream port_stream; + port_stream << ip_port; + return new Server( ip_address, port_stream.str(), std::min( omp_get_num_procs(), threads) ); } }; diff --git a/Tools/componentAnalysis.cpp b/Tools/componentAnalysis.cpp index 74d7104d2..a3154a184 100644 --- a/Tools/componentAnalysis.cpp +++ b/Tools/componentAnalysis.cpp @@ -26,7 +26,6 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "../DataStructures/QueryEdge.h" #include "../DataStructures/TurnInstructions.h" #include "../Util/GraphLoader.h" -#include "../Util/IniFile.h" #include "../Util/InputFileUtil.h" #include "../Util/OSRMException.h" #include "../Util/SimpleLogger.h" diff --git a/Util/ProgramOptions.h b/Util/ProgramOptions.h index cd2180b29..a1e2d4c46 100644 --- a/Util/ProgramOptions.h +++ b/Util/ProgramOptions.h @@ -21,6 +21,9 @@ or see http://www.gnu.org/licenses/agpl.txt. Custom validators for use with boost::program_options. */ +#ifndef PROGAM_OPTIONS_H +#define PROGAM_OPTIONS_H + #include "OSRMException.h" #include @@ -53,3 +56,5 @@ namespace boost { } } } + +#endif /* PROGRAM_OPTIONS_H */ diff --git a/contractor.ini b/contractor.ini deleted file mode 100644 index 4da33c7ef..000000000 --- a/contractor.ini +++ /dev/null @@ -1 +0,0 @@ -Threads = 4 diff --git a/createHierarchy.cpp b/createHierarchy.cpp index a3c6ceb20..13088effa 100644 --- a/createHierarchy.cpp +++ b/createHierarchy.cpp @@ -26,12 +26,13 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "DataStructures/QueryEdge.h" #include "DataStructures/StaticGraph.h" #include "DataStructures/StaticRTree.h" -#include "Util/IniFile.h" +#include "Util/GitDescription.h" #include "Util/GraphLoader.h" #include "Util/InputFileUtil.h" #include "Util/LuaUtil.h" #include "Util/OpenMPWrapper.h" #include "Util/OSRMException.h" +#include "Util/ProgramOptions.h" #include "Util/SimpleLogger.h" #include "Util/StringUtil.h" #include "typedefs.h" @@ -50,7 +51,6 @@ or see http://www.gnu.org/licenses/agpl.txt. typedef QueryEdge::EdgeData EdgeData; typedef DynamicGraph::InputEdge InputEdge; typedef StaticGraph::InputEdge StaticEdge; -typedef IniFile ContractorConfiguration; std::vector internalToExternalNodeMapping; std::vector inputRestrictions; @@ -61,30 +61,95 @@ std::vector edgeList; int main (int argc, char *argv[]) { try { LogPolicy::GetInstance().Unmute(); - if(argc < 3) { - SimpleLogger().Write(logWARNING) << - "usage: \n" << - argv[0] << " []"; + double startupTime = get_timestamp(); + boost::filesystem::path config_file_path, input_path, restrictions_path, profile_path; + int requested_num_threads; + + // declare a group of options that will be allowed only on command line + boost::program_options::options_description generic_options("Options"); + generic_options.add_options() + ("version,v", "Show version") + ("help,h", "Show this help message") + ("config,c", boost::program_options::value(&config_file_path)->default_value("contractor.ini"), + "Path to a configuration file."); + + // declare a group of options that will be allowed both on command line and in config file + boost::program_options::options_description config_options("Configuration"); + config_options.add_options() + ("restrictions,r", boost::program_options::value(&restrictions_path), + "Restrictions file in .osrm.restrictions format") + ("profile,p", boost::program_options::value(&profile_path)->default_value("profile.lua"), + "Path to LUA routing profile") + ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(10), + "Number of threads to use"); + + // hidden options, will be allowed both on command line and in config file, but will not be shown to the user + boost::program_options::options_description hidden_options("Hidden options"); + hidden_options.add_options() + ("input,i", boost::program_options::value(&input_path), + "Input file in .osm, .osm.bz2 or .osm.pbf format"); + + // positional option + boost::program_options::positional_options_description positional_options; + positional_options.add("input", 1); + + // combine above options for parsing + boost::program_options::options_description cmdline_options; + cmdline_options.add(generic_options).add(config_options).add(hidden_options); + + boost::program_options::options_description config_file_options; + config_file_options.add(config_options).add(hidden_options); + + boost::program_options::options_description visible_options("Usage: " + boost::filesystem::basename(argv[0]) + " [options]"); + visible_options.add(generic_options).add(config_options); + + // parse command line options + boost::program_options::variables_map option_variables; + boost::program_options::store(boost::program_options::command_line_parser(argc, argv). + options(cmdline_options).positional(positional_options).run(), option_variables); + + if(option_variables.count("version")) { + SimpleLogger().Write() << g_GIT_DESCRIPTION; + return 0; + } + + if(option_variables.count("help")) { + SimpleLogger().Write() << std::endl << visible_options; + return 0; + } + + boost::program_options::notify(option_variables); + + // parse config file + if(boost::filesystem::is_regular_file(config_file_path)) { + std::ifstream ifs(config_file_path.c_str()); + SimpleLogger().Write() << "Reading options from: " << config_file_path.filename().string(); + boost::program_options::store(parse_config_file(ifs, config_file_options), option_variables); + boost::program_options::notify(option_variables); + } + + if(!option_variables.count("restrictions")) { + restrictions_path = std::string( input_path.c_str()) + ".restrictions"; + } + + if(!option_variables.count("input")) { + SimpleLogger().Write(logWARNING) << "No input file specified"; return -1; } - double startupTime = get_timestamp(); - unsigned number_of_threads = omp_get_num_procs(); - if(testDataFile("contractor.ini")) { - ContractorConfiguration contractorConfig("contractor.ini"); - unsigned rawNumber = stringToInt(contractorConfig.GetParameter("Threads")); - if(rawNumber != 0 && rawNumber <= number_of_threads) - number_of_threads = rawNumber; + if(1 > requested_num_threads) { + SimpleLogger().Write(logWARNING) << "Number of threads must be 1 or larger"; + return -1; } - omp_set_num_threads(number_of_threads); - LogPolicy::GetInstance().Unmute(); - SimpleLogger().Write() << "Using restrictions from file: " << argv[2]; - std::ifstream restrictionsInstream(argv[2], std::ios::binary); - if(!restrictionsInstream.good()) { - std::cerr << - "Could not access files" << std::endl; - } + SimpleLogger().Write() << "Input file: " << input_path.filename().string(); + SimpleLogger().Write() << "Restrictions file: " << restrictions_path.filename().string(); + SimpleLogger().Write() << "Profile: " << profile_path.filename().string(); + SimpleLogger().Write() << "Threads: " << requested_num_threads; + + omp_set_num_threads( std::min( omp_get_num_procs(), requested_num_threads) ); + LogPolicy::GetInstance().Unmute(); + std::ifstream restrictionsInstream( restrictions_path.c_str(), std::ios::binary); TurnRestriction restriction; UUID uuid_loaded, uuid_orig; unsigned usableRestrictionsCounter(0); @@ -107,21 +172,15 @@ int main (int argc, char *argv[]) { restrictionsInstream.close(); std::ifstream in; - in.open (argv[1], std::ifstream::in | std::ifstream::binary); - if (!in.is_open()) { - throw OSRMException("Cannot open osrm input file"); - } + in.open (input_path.c_str(), std::ifstream::in | std::ifstream::binary); - std::string nodeOut(argv[1]); nodeOut += ".nodes"; - std::string edgeOut(argv[1]); edgeOut += ".edges"; - std::string graphOut(argv[1]); graphOut += ".hsgr"; - std::string rtree_nodes_path(argv[1]); rtree_nodes_path += ".ramIndex"; - std::string rtree_leafs_path(argv[1]); rtree_leafs_path += ".fileIndex"; + std::string nodeOut(input_path.c_str()); nodeOut += ".nodes"; + std::string edgeOut(input_path.c_str()); edgeOut += ".edges"; + std::string graphOut(input_path.c_str()); graphOut += ".hsgr"; + std::string rtree_nodes_path(input_path.c_str()); rtree_nodes_path += ".ramIndex"; + std::string rtree_leafs_path(input_path.c_str()); rtree_leafs_path += ".fileIndex"; /*** Setup Scripting Environment ***/ - if(!testDataFile( (argc > 3 ? argv[3] : "profile.lua") )) { - throw OSRMException("Cannot open profile.lua "); - } // Create a new lua state lua_State *myLuaState = luaL_newstate(); @@ -133,14 +192,10 @@ int main (int argc, char *argv[]) { luaL_openlibs(myLuaState); //adjust lua load path - luaAddScriptFolderToLoadPath( myLuaState, (argc > 3 ? argv[3] : "profile.lua") ); + luaAddScriptFolderToLoadPath( myLuaState, profile_path.c_str() ); // Now call our function in a lua script - SimpleLogger().Write() << - "Parsing speedprofile from " << - (argc > 3 ? argv[3] : "profile.lua"); - - if(0 != luaL_dofile(myLuaState, (argc > 3 ? argv[3] : "profile.lua") )) { + if(0 != luaL_dofile(myLuaState, profile_path.c_str() )) { std::cerr << lua_tostring(myLuaState,-1) << " occured in scripting block" << @@ -338,6 +393,12 @@ int main (int argc, char *argv[]) { //cleanedEdgeList.clear(); _nodes.clear(); SimpleLogger().Write() << "finished preprocessing"; + } catch(boost::program_options::too_many_positional_options_error& e) { + SimpleLogger().Write(logWARNING) << "Only one file can be specified"; + return -1; + } catch(boost::program_options::error& e) { + SimpleLogger().Write(logWARNING) << e.what(); + return -1; } catch ( const std::exception &e ) { SimpleLogger().Write(logWARNING) << "Exception occured: " << e.what() << std::endl; diff --git a/extractor.cpp b/extractor.cpp index 4a380e18b..81f86695c 100644 --- a/extractor.cpp +++ b/extractor.cpp @@ -197,11 +197,9 @@ int main (int argc, char *argv[]) { "extraction finished after " << get_timestamp() - startup_time << "s"; - SimpleLogger().Write() << "\nRun:\n./osrm-prepare " << - output_file_name << - " " << - restrictionsFileName << - std::endl; + SimpleLogger().Write() << "To prepare the data for routing, run: " + << "osrm-prepare " << output_file_name << std::endl; + } catch(boost::program_options::too_many_positional_options_error& e) { SimpleLogger().Write(logWARNING) << "Only one input file can be specified"; return -1; diff --git a/features/step_definitions/locate.rb b/features/step_definitions/locate.rb index 26f8fdd36..3b1d5d7da 100644 --- a/features/step_definitions/locate.rb +++ b/features/step_definitions/locate.rb @@ -1,7 +1,7 @@ When /^I request locate I should get$/ do |table| reprocess actual = [] - OSRMLauncher.new do + OSRMLauncher.new("#{@osm_file}.osrm") do table.hashes.each_with_index do |row,ri| in_node = find_node_by_name row['in'] raise "*** unknown in-node '#{row['in']}" unless in_node diff --git a/features/step_definitions/nearest.rb b/features/step_definitions/nearest.rb index 6c0af7a0f..352f6bc89 100644 --- a/features/step_definitions/nearest.rb +++ b/features/step_definitions/nearest.rb @@ -1,7 +1,7 @@ When /^I request nearest I should get$/ do |table| reprocess actual = [] - OSRMLauncher.new do + OSRMLauncher.new("#{@osm_file}.osrm") do table.hashes.each_with_index do |row,ri| in_node = find_node_by_name row['in'] raise "*** unknown in-node '#{row['in']}" unless in_node diff --git a/features/step_definitions/requests.rb b/features/step_definitions/requests.rb index d965b1aa0..fb1f9f8b7 100644 --- a/features/step_definitions/requests.rb +++ b/features/step_definitions/requests.rb @@ -1,6 +1,6 @@ When /^I request \/(.*)$/ do |path| reprocess - OSRMLauncher.new do + OSRMLauncher.new("#{@osm_file}.osrm") do @response = request_path path end end diff --git a/features/step_definitions/routability.rb b/features/step_definitions/routability.rb index d01d2234f..6c5148b14 100644 --- a/features/step_definitions/routability.rb +++ b/features/step_definitions/routability.rb @@ -5,7 +5,7 @@ Then /^routability should be$/ do |table| if table.headers&["forw","backw","bothw"] == [] raise "*** routability tabel must contain either 'forw', 'backw' or 'bothw' column" end - OSRMLauncher.new do + OSRMLauncher.new("#{@osm_file}.osrm") do table.hashes.each_with_index do |row,i| got = row.dup attempts = [] diff --git a/features/step_definitions/routing.rb b/features/step_definitions/routing.rb index 349fa9243..ead847166 100644 --- a/features/step_definitions/routing.rb +++ b/features/step_definitions/routing.rb @@ -1,7 +1,7 @@ When /^I route I should get$/ do |table| reprocess actual = [] - OSRMLauncher.new do + OSRMLauncher.new("#{@osm_file}.osrm") do table.hashes.each_with_index do |row,ri| waypoints = [] if row['from'] and row['to'] diff --git a/features/support/config.rb b/features/support/config.rb index 9c4cb0fd7..e61c9fc74 100644 --- a/features/support/config.rb +++ b/features/support/config.rb @@ -10,21 +10,3 @@ end def set_profile profile @profile = profile end - -def write_server_ini - s=<<-EOF - Threads = 1 - IP = 0.0.0.0 - Port = #{OSRM_PORT} - - hsgrData=#{@osm_file}.osrm.hsgr - nodesData=#{@osm_file}.osrm.nodes - edgesData=#{@osm_file}.osrm.edges - ramIndex=#{@osm_file}.osrm.ramIndex - fileIndex=#{@osm_file}.osrm.fileIndex - namesData=#{@osm_file}.osrm.names - timestamp=#{@osm_file}.osrm.timestamp - EOF - File.open( 'server.ini', 'w') {|f| f.write( s ) } -end - diff --git a/features/support/data.rb b/features/support/data.rb index 6af83d96c..b11e460f7 100644 --- a/features/support/data.rb +++ b/features/support/data.rb @@ -263,13 +263,12 @@ def reprocess unless prepared? log_preprocess_info log "== Preparing #{@osm_file}.osm...", :preprocess - unless system "#{BIN_PATH}/osrm-prepare #{@osm_file}.osrm #{@osm_file}.osrm.restrictions 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE} #{PROFILES_PATH}/#{@profile}.lua" + unless system "#{BIN_PATH}/osrm-prepare #{@osm_file}.osrm --profile #{PROFILES_PATH}/#{@profile}.lua 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE}" log "*** Exited with code #{$?.exitstatus}.", :preprocess raise PrepareError.new $?.exitstatus, "osrm-prepare exited with code #{$?.exitstatus}." end log '', :preprocess end log_preprocess_done - write_server_ini end end diff --git a/features/support/file.rb b/features/support/file.rb index 602f07e48..03d4ce939 100644 --- a/features/support/file.rb +++ b/features/support/file.rb @@ -18,5 +18,7 @@ class File tail_of_file = chunks.join('') ary = tail_of_file.split(/\n/) lines_to_return = ary[ ary.size - n, ary.size - 1 ] + rescue + ["Cannot read log file!"] end end \ No newline at end of file diff --git a/features/support/launch.rb b/features/support/launch.rb index 9e95e5259..02e236665 100644 --- a/features/support/launch.rb +++ b/features/support/launch.rb @@ -6,7 +6,8 @@ SHUTDOWN_TIMEOUT = 2 OSRM_ROUTED_LOG_FILE = 'osrm-routed.log' class OSRMLauncher - def initialize &block + def initialize input_file, &block + @input_file = input_file Dir.chdir TEST_FOLDER do begin launch @@ -48,7 +49,7 @@ class OSRMLauncher def osrm_up return if osrm_up? - @pid = Process.spawn(["#{BIN_PATH}/osrm-routed",''],:out=>OSRM_ROUTED_LOG_FILE, :err=>OSRM_ROUTED_LOG_FILE) + @pid = Process.spawn("#{BIN_PATH}/osrm-routed #{@input_file} --port #{OSRM_PORT}",:out=>OSRM_ROUTED_LOG_FILE, :err=>OSRM_ROUTED_LOG_FILE) end def osrm_down diff --git a/routed.cpp b/routed.cpp index de6ad1472..6eb97b94a 100644 --- a/routed.cpp +++ b/routed.cpp @@ -23,9 +23,10 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "Server/ServerFactory.h" -#include "Util/IniFile.h" +#include "Util/GitDescription.h" #include "Util/InputFileUtil.h" #include "Util/OpenMPWrapper.h" +#include "Util/ProgramOptions.h" #include "Util/SimpleLogger.h" #include "Util/UUID.h" @@ -73,8 +74,140 @@ int main (int argc, char * argv[]) { installCrashHandler(argv[0]); #endif + + boost::unordered_map paths; + std::string ip_address; + int ip_port, requested_num_threads; + + // declare a group of options that will be allowed only on command line + boost::program_options::options_description generic_options("Options"); + generic_options.add_options() + ("version,v", "Show version") + ("help,h", "Show this help message") + ("config,c", boost::program_options::value(&paths["config"])->default_value("server.ini"), + "Path to a configuration file."); + + // declare a group of options that will be allowed both on command line and in config file + boost::program_options::options_description config_options("Configuration"); + config_options.add_options() + ("hsgr", boost::program_options::value(&paths["hsgr"]), + "HSGR file") + ("nodes", boost::program_options::value(&paths["nodes"]), + "Nodes file") + ("edges", boost::program_options::value(&paths["edges"]), + "Edges file") + ("ram-index", boost::program_options::value(&paths["ramIndex"]), + "RAM index file") + ("file-index", boost::program_options::value(&paths["fileIndex"]), + "File index file") + ("names", boost::program_options::value(&paths["names"]), + "Names file") + ("timestamp", boost::program_options::value(&paths["timestamp"]), + "Timestamp file") + ("ip,i", boost::program_options::value(&ip_address)->default_value("0.0.0.0"), + "IP address") + ("port,p", boost::program_options::value(&ip_port)->default_value(5000), + "IP Port") + ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(10), + "Number of threads to use"); + + // hidden options, will be allowed both on command line and in config file, but will not be shown to the user + boost::program_options::options_description hidden_options("Hidden options"); + hidden_options.add_options() + ("input,i", boost::program_options::value(&paths["input"]), + "Input file in .osrm format"); + + // positional option + boost::program_options::positional_options_description positional_options; + positional_options.add("input", 1); + + // combine above options for parsing + boost::program_options::options_description cmdline_options; + cmdline_options.add(generic_options).add(config_options).add(hidden_options); + + boost::program_options::options_description config_file_options; + config_file_options.add(config_options).add(hidden_options); + + boost::program_options::options_description visible_options(boost::filesystem::basename(argv[0]) + " []"); + visible_options.add(generic_options).add(config_options); + + // parse command line options + boost::program_options::variables_map option_variables; + boost::program_options::store(boost::program_options::command_line_parser(argc, argv). + options(cmdline_options).positional(positional_options).run(), option_variables); + + if(option_variables.count("version")) { + SimpleLogger().Write() << g_GIT_DESCRIPTION; + return 0; + } + + if(option_variables.count("help")) { + SimpleLogger().Write() << visible_options; + return 0; + } + + boost::program_options::notify(option_variables); + + // parse config file + if(boost::filesystem::is_regular_file(paths["config"])) { + std::ifstream ifs(paths["config"].c_str()); + SimpleLogger().Write() << "Reading options from: " << paths["config"].c_str(); + boost::program_options::store(parse_config_file(ifs, config_file_options), option_variables); + boost::program_options::notify(option_variables); + } + + if(!option_variables.count("hsgr")) { + paths["hsgr"] = std::string( paths["input"].c_str()) + ".hsgr"; + } + + if(!option_variables.count("nodes")) { + paths["nodes"] = std::string( paths["input"].c_str()) + ".nodes"; + } + + if(!option_variables.count("edges")) { + paths["edges"] = std::string( paths["input"].c_str()) + ".edges"; + } + + if(!option_variables.count("ram")) { + paths["ramIndex"] = std::string( paths["input"].c_str()) + ".ramIndex"; + } + + if(!option_variables.count("index")) { + paths["fileIndex"] = std::string( paths["input"].c_str()) + ".fileIndex"; + } + + if(!option_variables.count("names")) { + paths["names"] = std::string( paths["input"].c_str()) + ".names"; + } + + if(!option_variables.count("timestamp")) { + paths["timestamp"] = std::string( paths["input"].c_str()) + ".timestamp"; + } + + if(!option_variables.count("input")) { + SimpleLogger().Write(logWARNING) << "No input file specified"; + return -1; + } + + if(1 > requested_num_threads) { + SimpleLogger().Write(logWARNING) << "Number of threads must be 1 or larger"; + return -1; + } + SimpleLogger().Write() << - "starting up engines, compiled at " << __DATE__ << ", " __TIME__; + "starting up engines, " << g_GIT_DESCRIPTION << ", compiled at " << __DATE__ << ", " __TIME__; + + SimpleLogger().Write() << "Input file:\t" << paths["input"].c_str(); + SimpleLogger().Write() << "HSGR file:\t" << paths["hsgr"].c_str(); + SimpleLogger().Write() << "Nodes file:\t" << paths["nodes"].c_str(); + SimpleLogger().Write() << "Edges file:\t" << paths["edges"].c_str(); + SimpleLogger().Write() << "RAM file:\t" << paths["ramIndex"].c_str(); + SimpleLogger().Write() << "Index file:\t" << paths["fileIndex"].c_str(); + SimpleLogger().Write() << "Names file:\t" << paths["names"].c_str(); + SimpleLogger().Write() << "Timestamp file:\t" << paths["timestamp"].c_str(); + SimpleLogger().Write() << "Threads:\t" << requested_num_threads; + SimpleLogger().Write() << "IP address:\t" << ip_address; + SimpleLogger().Write() << "IP port:\t" << ip_port; #ifndef _WIN32 int sig = 0; @@ -84,10 +217,8 @@ int main (int argc, char * argv[]) { pthread_sigmask(SIG_BLOCK, &new_mask, &old_mask); #endif - IniFile serverConfig((argc > 1 ? argv[1] : "server.ini")); - OSRM routing_machine((argc > 1 ? argv[1] : "server.ini")); - - Server * s = ServerFactory::CreateServer(serverConfig); + OSRM routing_machine(paths); + Server * s = ServerFactory::CreateServer(ip_address,ip_port,requested_num_threads); s->GetRequestHandlerPtr().RegisterRoutingMachine(&routing_machine); boost::thread t(boost::bind(&Server::Run, s)); diff --git a/server.ini b/server.ini deleted file mode 100644 index e8138257e..000000000 --- a/server.ini +++ /dev/null @@ -1,11 +0,0 @@ -Threads = 8 -IP = 0.0.0.0 -Port = 5000 - -hsgrData=/Users/dennisluxen/Downloads/berlin-latest.osrm.hsgr -nodesData=/Users/dennisluxen/Downloads/berlin-latest.osrm.nodes -edgesData=/Users/dennisluxen/Downloads/berlin-latest.osrm.edges -ramIndex=/Users/dennisluxen/Downloads/berlin-latest.osrm.ramIndex -fileIndex=/Users/dennisluxen/Downloads/berlin-latest.osrm.fileIndex -namesData=/Users/dennisluxen/Downloads/berlin-latest.osrm.names -timestamp=/Users/dennisluxen/Downloads/berlin-latest.osrm.timestamp diff --git a/test/contractor.ini b/test/contractor.ini deleted file mode 100644 index 4da33c7ef..000000000 --- a/test/contractor.ini +++ /dev/null @@ -1 +0,0 @@ -Threads = 4 From c4904cc365664ba66ef9bcde460183a69c2d25bf Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Wed, 28 Aug 2013 09:39:25 +0200 Subject: [PATCH 24/36] test nearest/locate with high lat/lon, fix fuzzy match of negative numbers --- features/locate/locate.feature | 8 ++++---- features/nearest/pick.feature | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/features/locate/locate.feature b/features/locate/locate.feature index ad99ce9af..838bcd5cd 100644 --- a/features/locate/locate.feature +++ b/features/locate/locate.feature @@ -178,8 +178,8 @@ Feature: Locate - return nearest node | x | x | | y | y | - Scenario: Locate - High lat/lon - Given the node locations + Scenario: Locate - High lat/lon + Given the node locations | node | lat | lon | | a | -85 | -180 | | b | 0 | 0 | @@ -187,11 +187,11 @@ Feature: Locate - return nearest node | x | -84 | -180 | | y | 84 | 180 | - And the ways + And the ways | nodes | | abc | - When I request locate I should get + When I request locate I should get | in | out | | x | a | | y | c | diff --git a/features/nearest/pick.feature b/features/nearest/pick.feature index bf942c24e..c0761f62d 100644 --- a/features/nearest/pick.feature +++ b/features/nearest/pick.feature @@ -75,4 +75,4 @@ Feature: Locating Nearest node on a Way - pick closest way | x | a | | y | c | | v | b | - | w | b | \ No newline at end of file + | w | b | From 644fad8355c4153fee340e66a225c13f94093b89 Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Tue, 24 Sep 2013 19:21:02 +0200 Subject: [PATCH 25/36] allow old capitalized option names in routed, few other adjustments --- Server/DataStructures/QueryObjectsStorage.cpp | 28 ++--- routed.cpp | 109 +++++++++++------- 2 files changed, 84 insertions(+), 53 deletions(-) diff --git a/Server/DataStructures/QueryObjectsStorage.cpp b/Server/DataStructures/QueryObjectsStorage.cpp index d7c22ef47..d99aed555 100644 --- a/Server/DataStructures/QueryObjectsStorage.cpp +++ b/Server/DataStructures/QueryObjectsStorage.cpp @@ -22,22 +22,22 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "QueryObjectsStorage.h" QueryObjectsStorage::QueryObjectsStorage(boost::unordered_map& paths) { - if( paths["hsgr"].empty() ) { + if( paths["hsgrdata"].empty() ) { throw OSRMException("no hsgr file given in ini file"); } - if( paths["ramIndex"].empty() ) { + if( paths["ramindex"].empty() ) { throw OSRMException("no ram index file given in ini file"); } - if( paths["fileIndex"].empty() ) { + if( paths["fileindex"].empty() ) { throw OSRMException("no mem index file given in ini file"); } - if( paths["nodes"].empty() ) { + if( paths["nodesdata"].empty() ) { throw OSRMException("no nodes file given in ini file"); } - if( paths["edges"].empty() ) { + if( paths["edgesdata"].empty() ) { throw OSRMException("no edges file given in ini file"); } - if( paths["names"].empty() ) { + if( paths["namesdata"].empty() ) { throw OSRMException("no names file given in ini file"); } @@ -46,7 +46,7 @@ QueryObjectsStorage::QueryObjectsStorage(boost::unordered_map node_list; std::vector< QueryGraph::_StrEdge> edge_list; const int number_of_nodes = readHSGRFromStream( - paths["hsgr"].c_str(), + paths["hsgrdata"].c_str(), node_list, edge_list, &check_sum @@ -77,10 +77,10 @@ QueryObjectsStorage::QueryObjectsStorage(boost::unordered_map #include #include +#include #include @@ -85,22 +86,22 @@ int main (int argc, char * argv[]) { ("version,v", "Show version") ("help,h", "Show this help message") ("config,c", boost::program_options::value(&paths["config"])->default_value("server.ini"), - "Path to a configuration file."); + "Path to a configuration file"); // declare a group of options that will be allowed both on command line and in config file boost::program_options::options_description config_options("Configuration"); config_options.add_options() - ("hsgr", boost::program_options::value(&paths["hsgr"]), + ("hsgrdata", boost::program_options::value(&paths["hsgrdata"]), "HSGR file") - ("nodes", boost::program_options::value(&paths["nodes"]), + ("nodesdata", boost::program_options::value(&paths["nodesdata"]), "Nodes file") - ("edges", boost::program_options::value(&paths["edges"]), + ("edgesdata", boost::program_options::value(&paths["edgesdata"]), "Edges file") - ("ram-index", boost::program_options::value(&paths["ramIndex"]), + ("ramindex", boost::program_options::value(&paths["ramindex"]), "RAM index file") - ("file-index", boost::program_options::value(&paths["fileIndex"]), + ("fileindex", boost::program_options::value(&paths["fileindex"]), "File index file") - ("names", boost::program_options::value(&paths["names"]), + ("namesdata", boost::program_options::value(&paths["namesdata"]), "Names file") ("timestamp", boost::program_options::value(&paths["timestamp"]), "Timestamp file") @@ -108,18 +109,18 @@ int main (int argc, char * argv[]) { "IP address") ("port,p", boost::program_options::value(&ip_port)->default_value(5000), "IP Port") - ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(10), + ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(8), "Number of threads to use"); // hidden options, will be allowed both on command line and in config file, but will not be shown to the user boost::program_options::options_description hidden_options("Hidden options"); hidden_options.add_options() - ("input,i", boost::program_options::value(&paths["input"]), - "Input file in .osrm format"); + ("base,b", boost::program_options::value(&paths["base"]), + "base path to .osrm file, other wil be located in the same folder"); // positional option boost::program_options::positional_options_description positional_options; - positional_options.add("input", 1); + positional_options.add("base", 1); // combine above options for parsing boost::program_options::options_description cmdline_options; @@ -128,7 +129,7 @@ int main (int argc, char * argv[]) { boost::program_options::options_description config_file_options; config_file_options.add(config_options).add(hidden_options); - boost::program_options::options_description visible_options(boost::filesystem::basename(argv[0]) + " []"); + boost::program_options::options_description visible_options(boost::filesystem::basename(argv[0]) + " []"); visible_options.add(generic_options).add(config_options); // parse command line options @@ -150,43 +151,74 @@ int main (int argc, char * argv[]) { // parse config file if(boost::filesystem::is_regular_file(paths["config"])) { - std::ifstream ifs(paths["config"].c_str()); SimpleLogger().Write() << "Reading options from: " << paths["config"].c_str(); - boost::program_options::store(parse_config_file(ifs, config_file_options), option_variables); + std::ifstream config_stream(paths["config"].c_str()); + std::string config_str( (std::istreambuf_iterator(config_stream)), std::istreambuf_iterator() ); + + //support old capitalized option names by downcasing them with a regex replace + boost::regex option_name_regex( "^([^=]*)" ); //match from start of line to '=' + std::string option_name_format( "\\L$1\\E" ); //replace with downcased substring + std::string modified_config_str = boost::regex_replace( config_str, option_name_regex, option_name_format ); + std::stringstream modified_stream(modified_config_str); + + boost::program_options::store(parse_config_file(modified_stream, config_file_options), option_variables); boost::program_options::notify(option_variables); } - if(!option_variables.count("hsgr")) { - paths["hsgr"] = std::string( paths["input"].c_str()) + ".hsgr"; + if(!option_variables.count("hsgrdata")) { + if(!option_variables.count("base")) { + SimpleLogger().Write(logWARNING) << "hsgrdata (or base) must be specified"; + return -1; + } + paths["hsgrdata"] = std::string( paths["base"].c_str()) + ".hsgr"; } - if(!option_variables.count("nodes")) { - paths["nodes"] = std::string( paths["input"].c_str()) + ".nodes"; + if(!option_variables.count("nodesdata")) { + if(!option_variables.count("base")) { + SimpleLogger().Write(logWARNING) << "nodesdata (or base) must be specified"; + return -1; + } + paths["nodesdata"] = std::string( paths["base"].c_str()) + ".nodes"; } - if(!option_variables.count("edges")) { - paths["edges"] = std::string( paths["input"].c_str()) + ".edges"; + if(!option_variables.count("edgesdata")) { + if(!option_variables.count("base")) { + SimpleLogger().Write(logWARNING) << "edgesdata (or base) must be specified"; + return -1; + } + paths["edgesdata"] = std::string( paths["base"].c_str()) + ".edges"; } - if(!option_variables.count("ram")) { - paths["ramIndex"] = std::string( paths["input"].c_str()) + ".ramIndex"; + if(!option_variables.count("ramindex")) { + if(!option_variables.count("base")) { + SimpleLogger().Write(logWARNING) << "ramindex (or base) must be specified"; + return -1; + } + paths["ramindex"] = std::string( paths["base"].c_str()) + ".ramIndex"; } - if(!option_variables.count("index")) { - paths["fileIndex"] = std::string( paths["input"].c_str()) + ".fileIndex"; + if(!option_variables.count("fileindex")) { + if(!option_variables.count("base")) { + SimpleLogger().Write(logWARNING) << "fileindex (or base) must be specified"; + return -1; + } + paths["fileindex"] = std::string( paths["base"].c_str()) + ".fileIndex"; } - if(!option_variables.count("names")) { - paths["names"] = std::string( paths["input"].c_str()) + ".names"; + if(!option_variables.count("namesdata")) { + if(!option_variables.count("base")) { + SimpleLogger().Write(logWARNING) << "namesdata (or base) must be specified"; + return -1; + } + paths["namesdata"] = std::string( paths["base"].c_str()) + ".names"; } if(!option_variables.count("timestamp")) { - paths["timestamp"] = std::string( paths["input"].c_str()) + ".timestamp"; - } - - if(!option_variables.count("input")) { - SimpleLogger().Write(logWARNING) << "No input file specified"; - return -1; + if(!option_variables.count("base")) { + SimpleLogger().Write(logWARNING) << "timestamp (or base) must be specified"; + return -1; + } + paths["timestamp"] = std::string( paths["base"].c_str()) + ".timestamp"; } if(1 > requested_num_threads) { @@ -197,13 +229,12 @@ int main (int argc, char * argv[]) { SimpleLogger().Write() << "starting up engines, " << g_GIT_DESCRIPTION << ", compiled at " << __DATE__ << ", " __TIME__; - SimpleLogger().Write() << "Input file:\t" << paths["input"].c_str(); - SimpleLogger().Write() << "HSGR file:\t" << paths["hsgr"].c_str(); - SimpleLogger().Write() << "Nodes file:\t" << paths["nodes"].c_str(); - SimpleLogger().Write() << "Edges file:\t" << paths["edges"].c_str(); - SimpleLogger().Write() << "RAM file:\t" << paths["ramIndex"].c_str(); - SimpleLogger().Write() << "Index file:\t" << paths["fileIndex"].c_str(); - SimpleLogger().Write() << "Names file:\t" << paths["names"].c_str(); + SimpleLogger().Write() << "HSGR file:\t" << paths["hsgrdata"].c_str(); + SimpleLogger().Write() << "Nodes file:\t" << paths["nodesdata"].c_str(); + SimpleLogger().Write() << "Edges file:\t" << paths["edgesdata"].c_str(); + SimpleLogger().Write() << "RAM file:\t" << paths["ramindex"].c_str(); + SimpleLogger().Write() << "Index file:\t" << paths["fileindex"].c_str(); + SimpleLogger().Write() << "Names file:\t" << paths["namesdata"].c_str(); SimpleLogger().Write() << "Timestamp file:\t" << paths["timestamp"].c_str(); SimpleLogger().Write() << "Threads:\t" << requested_num_threads; SimpleLogger().Write() << "IP address:\t" << ip_address; From 5f90ed8b3edb9e7d44fd1fad4d78e8b1a5112a94 Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Tue, 24 Sep 2013 21:50:20 +0200 Subject: [PATCH 26/36] support capitalized option names in extract/prepare --- Util/ProgramOptions.h | 11 +++++++++++ createHierarchy.cpp | 11 ++++++----- extractor.cpp | 10 ++++++---- features/testbot/graph.feature | 2 +- routed.cpp | 17 +++++------------ 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Util/ProgramOptions.h b/Util/ProgramOptions.h index a1e2d4c46..faba2dcc0 100644 --- a/Util/ProgramOptions.h +++ b/Util/ProgramOptions.h @@ -29,6 +29,7 @@ Custom validators for use with boost::program_options. #include #include #include +#include #include #include @@ -57,4 +58,14 @@ namespace boost { } } +//support old capitalized option names by downcasing them with a regex replace +//read from file and store in a stringstream that can be passed to boost::program_options +inline void PrepareConfigFile(const boost::filesystem::path& path, std::string& output ) { + std::ifstream config_stream(path.c_str()); + std::string input_str( (std::istreambuf_iterator(config_stream)), std::istreambuf_iterator() ); + boost::regex regex( "^([^=]*)" ); //match from start of line to '=' + std::string format( "\\L$1\\E" ); //replace with downcased substring + output = boost::regex_replace( input_str, regex, format ); +} + #endif /* PROGRAM_OPTIONS_H */ diff --git a/createHierarchy.cpp b/createHierarchy.cpp index 13088effa..4db469b6e 100644 --- a/createHierarchy.cpp +++ b/createHierarchy.cpp @@ -80,7 +80,7 @@ int main (int argc, char *argv[]) { "Restrictions file in .osrm.restrictions format") ("profile,p", boost::program_options::value(&profile_path)->default_value("profile.lua"), "Path to LUA routing profile") - ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(10), + ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(8), "Number of threads to use"); // hidden options, will be allowed both on command line and in config file, but will not be shown to the user @@ -120,11 +120,12 @@ int main (int argc, char *argv[]) { boost::program_options::notify(option_variables); - // parse config file if(boost::filesystem::is_regular_file(config_file_path)) { - std::ifstream ifs(config_file_path.c_str()); - SimpleLogger().Write() << "Reading options from: " << config_file_path.filename().string(); - boost::program_options::store(parse_config_file(ifs, config_file_options), option_variables); + SimpleLogger().Write() << "Reading options from: " << config_file_path.c_str(); + std::string config_str; + PrepareConfigFile( config_file_path.c_str(), config_str ); + std::stringstream config_stream( config_str ); + boost::program_options::store(parse_config_file(config_stream, config_file_options), option_variables); boost::program_options::notify(option_variables); } diff --git a/extractor.cpp b/extractor.cpp index 81f86695c..73c49ccc8 100644 --- a/extractor.cpp +++ b/extractor.cpp @@ -63,7 +63,7 @@ int main (int argc, char *argv[]) { config_options.add_options() ("profile,p", boost::program_options::value(&profile_path)->default_value("profile.lua"), "Path to LUA routing profile") - ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(10), + ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(8), "Number of threads to use"); // hidden options, will be allowed both on command line and in config file, but will not be shown to the user @@ -105,9 +105,11 @@ int main (int argc, char *argv[]) { // parse config file if(boost::filesystem::is_regular_file(config_file_path)) { - std::ifstream ifs(config_file_path.c_str()); - SimpleLogger().Write() << "Reading options from: " << config_file_path.filename().string(); - boost::program_options::store(parse_config_file(ifs, config_file_options), option_variables); + SimpleLogger().Write() << "Reading options from: " << config_file_path.c_str(); + std::string config_str; + PrepareConfigFile( config_file_path.c_str(), config_str ); + std::stringstream config_stream( config_str ); + boost::program_options::store(parse_config_file(config_stream, config_file_options), option_variables); boost::program_options::notify(option_variables); } diff --git a/features/testbot/graph.feature b/features/testbot/graph.feature index 481d7ff38..a870106dc 100644 --- a/features/testbot/graph.feature +++ b/features/testbot/graph.feature @@ -1,6 +1,6 @@ @routing @graph Feature: Basic Routing -Test the input data descibed on https://github.com/DennisOSRM/Project-OSRM/wiki/Graph-representation +#Test the input data descibed on https://github.com/DennisOSRM/Project-OSRM/wiki/Graph-representation Background: Given the profile "testbot" diff --git a/routed.cpp b/routed.cpp index 40d9106bf..6f7b15fc2 100644 --- a/routed.cpp +++ b/routed.cpp @@ -40,7 +40,6 @@ or see http://www.gnu.org/licenses/agpl.txt. #include #include #include -#include #include @@ -109,7 +108,7 @@ int main (int argc, char * argv[]) { "IP address") ("port,p", boost::program_options::value(&ip_port)->default_value(5000), "IP Port") - ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(8), + ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(8), "Number of threads to use"); // hidden options, will be allowed both on command line and in config file, but will not be shown to the user @@ -152,16 +151,10 @@ int main (int argc, char * argv[]) { // parse config file if(boost::filesystem::is_regular_file(paths["config"])) { SimpleLogger().Write() << "Reading options from: " << paths["config"].c_str(); - std::ifstream config_stream(paths["config"].c_str()); - std::string config_str( (std::istreambuf_iterator(config_stream)), std::istreambuf_iterator() ); - - //support old capitalized option names by downcasing them with a regex replace - boost::regex option_name_regex( "^([^=]*)" ); //match from start of line to '=' - std::string option_name_format( "\\L$1\\E" ); //replace with downcased substring - std::string modified_config_str = boost::regex_replace( config_str, option_name_regex, option_name_format ); - std::stringstream modified_stream(modified_config_str); - - boost::program_options::store(parse_config_file(modified_stream, config_file_options), option_variables); + std::string config_str; + PrepareConfigFile( paths["config"], config_str ); + std::stringstream config_stream( config_str ); + boost::program_options::store(parse_config_file(config_stream, config_file_options), option_variables); boost::program_options::notify(option_variables); } From d91382208d8bfb65db2be48df4f40b5e248f4dd8 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sat, 12 Oct 2013 15:18:51 +0200 Subject: [PATCH 27/36] ignore server.ini --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index d87653237..909ca894a 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,7 @@ stxxl.errlog /sandbox/ /test/profile.lua + +# Deprecated config file # +########################## +/server.ini From 26ab8755b641c6aedd010c45eb2f0298edd1d41c Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sat, 12 Oct 2013 15:19:59 +0200 Subject: [PATCH 28/36] move program options for routed/simpleclient into common header --- Util/ProgramOptions.h | 211 +++++++++++++++++++++++++++++++++++++++++- routed.cpp | 203 +++++++++------------------------------- 2 files changed, 249 insertions(+), 165 deletions(-) diff --git a/Util/ProgramOptions.h b/Util/ProgramOptions.h index faba2dcc0..562182df7 100644 --- a/Util/ProgramOptions.h +++ b/Util/ProgramOptions.h @@ -24,16 +24,25 @@ Custom validators for use with boost::program_options. #ifndef PROGAM_OPTIONS_H #define PROGAM_OPTIONS_H +#include "GitDescription.h" #include "OSRMException.h" +#include "SimpleLogger.h" #include #include #include #include +#include +#include #include #include +typedef boost::unordered_map< + const std::string, + boost::filesystem::path + > ServerPaths; + namespace boost { namespace filesystem { // Validator for boost::filesystem::path, that verifies that the file @@ -58,14 +67,206 @@ namespace boost { } } -//support old capitalized option names by downcasing them with a regex replace -//read from file and store in a stringstream that can be passed to boost::program_options -inline void PrepareConfigFile(const boost::filesystem::path& path, std::string& output ) { - std::ifstream config_stream(path.c_str()); - std::string input_str( (std::istreambuf_iterator(config_stream)), std::istreambuf_iterator() ); +// support old capitalized option names by downcasing them with a regex replace +// read from file and store in a stringstream that can be passed to +// boost::program_options +inline void PrepareConfigFile( + const boost::filesystem::path& path, + std::string& output +) { + std::ifstream config_stream(path.string().c_str()); + std::string input_str( + (std::istreambuf_iterator(config_stream)), + std::istreambuf_iterator() + ); boost::regex regex( "^([^=]*)" ); //match from start of line to '=' std::string format( "\\L$1\\E" ); //replace with downcased substring output = boost::regex_replace( input_str, regex, format ); } + +// generate boost::program_options object for the routing part +bool GenerateServerProgramOptions( + const int argc, + const char * argv[], + ServerPaths & paths, + std::string & ip_address, + int & ip_port, + int & requested_num_threads +) { + + // declare a group of options that will be allowed only on command line + boost::program_options::options_description generic_options("Options"); + generic_options.add_options() + ("version,v", "Show version") + ("help,h", "Show this help message") + ( + "config,c", + boost::program_options::value( + &paths["config"] + )->default_value("server.ini"), + "Path to a configuration file" + ); + + // declare a group of options that will be allowed both on command line + // as well as in a config file + boost::program_options::options_description config_options("Configuration"); + config_options.add_options() + ( + "hsgrdata", + boost::program_options::value(&paths["hsgrdata"]), + ".hsgr file" + ) + ( + "nodesdata", + boost::program_options::value(&paths["nodesdata"]), + ".nodes file" + ) + ( + "edgesdata", + boost::program_options::value(&paths["edgesdata"]), + ".edges file") + ( + "ramindex", + boost::program_options::value(&paths["ramindex"]), + ".ramIndex file") + ( + "fileindex", + boost::program_options::value(&paths["fileindex"]), + "File index file") + ( + "namesdata", + boost::program_options::value(&paths["namesdata"]), + ".names file") + ( + "timestamp", + boost::program_options::value(&paths["timestamp"]), + ".timestamp file") + ( + "ip,i", + boost::program_options::value(&ip_address)->default_value("0.0.0.0"), + "IP address" + ) + ( + "port,p", + boost::program_options::value(&ip_port)->default_value(5000), + "TCP/IP port" + ) + ( + "threads,t", + boost::program_options::value(&requested_num_threads)->default_value(8), + "Number of threads to use" + ); + + // hidden options, will be allowed both on command line and in config + // file, but will not be shown to the user + boost::program_options::options_description hidden_options("Hidden options"); + hidden_options.add_options() + ( + "base,b", + boost::program_options::value(&paths["base"]), + "base path to .osrm file" + ); + + // positional option + boost::program_options::positional_options_description positional_options; + positional_options.add("base", 1); + + // combine above options for parsing + boost::program_options::options_description cmdline_options; + cmdline_options.add(generic_options).add(config_options).add(hidden_options); + + boost::program_options::options_description config_file_options; + config_file_options.add(config_options).add(hidden_options); + + boost::program_options::options_description visible_options( + boost::filesystem::basename(argv[0]) + " []" + ); + visible_options.add(generic_options).add(config_options); + + // parse command line options + boost::program_options::variables_map option_variables; + boost::program_options::store( + boost::program_options::command_line_parser(argc, argv).options(cmdline_options).positional(positional_options).run(), + option_variables + ); + + if(option_variables.count("version")) { + SimpleLogger().Write() << g_GIT_DESCRIPTION; + return false; + } + + if(option_variables.count("help")) { + SimpleLogger().Write() << visible_options; + return false; + } + + boost::program_options::notify(option_variables); + + // parse config file + if(boost::filesystem::is_regular_file(paths["config"])) { + SimpleLogger().Write() << + "Reading options from: " << paths["config"].c_str(); + std::string config_str; + PrepareConfigFile( paths["config"], config_str ); + std::stringstream config_stream( config_str ); + boost::program_options::store(parse_config_file(config_stream, config_file_options), option_variables); + boost::program_options::notify(option_variables); + } + + if(!option_variables.count("hsgrdata")) { + if(!option_variables.count("base")) { + throw OSRMException("hsgrdata (or base) must be specified"); + } + paths["hsgrdata"] = std::string( paths["base"].c_str()) + ".hsgr"; + } + + if(!option_variables.count("nodesdata")) { + if(!option_variables.count("base")) { + throw OSRMException("nodesdata (or base) must be specified"); + } + paths["nodesdata"] = std::string( paths["base"].c_str()) + ".nodes"; + } + + if(!option_variables.count("edgesdata")) { + if(!option_variables.count("base")) { + throw OSRMException("edgesdata (or base) must be specified"); + } + paths["edgesdata"] = std::string( paths["base"].c_str()) + ".edges"; + } + + if(!option_variables.count("ramindex")) { + if(!option_variables.count("base")) { + throw OSRMException("ramindex (or base) must be specified"); + } + paths["ramindex"] = std::string( paths["base"].c_str()) + ".ramIndex"; + } + + if(!option_variables.count("fileindex")) { + if(!option_variables.count("base")) { + throw OSRMException("fileindex (or base) must be specified"); + } + paths["fileindex"] = std::string( paths["base"].c_str()) + ".fileIndex"; + } + + if(!option_variables.count("namesdata")) { + if(!option_variables.count("base")) { + throw OSRMException("namesdata (or base) must be specified"); + } + paths["namesdata"] = std::string( paths["base"].c_str()) + ".names"; + } + + if(!option_variables.count("timestamp")) { + if(!option_variables.count("base")) { + throw OSRMException("timestamp (or base) must be specified"); + } + paths["timestamp"] = std::string( paths["base"].c_str()) + ".timestamp"; + } + + if(1 > requested_num_threads) { + throw OSRMException("Number of threads must be a positive number"); + } + return true; +} + #endif /* PROGRAM_OPTIONS_H */ diff --git a/routed.cpp b/routed.cpp index 6f7b15fc2..c4e71a8ce 100644 --- a/routed.cpp +++ b/routed.cpp @@ -62,176 +62,56 @@ BOOL WINAPI console_ctrl_handler(DWORD ctrl_type) } #endif -int main (int argc, char * argv[]) { +int main (int argc, const char * argv[]) { try { LogPolicy::GetInstance().Unmute(); #ifdef __linux__ if(!mlockall(MCL_CURRENT | MCL_FUTURE)) { - SimpleLogger().Write(logWARNING) << "Process " << argv[0] << "could not be locked to RAM"; + SimpleLogger().Write(logWARNING) << + "Process " << argv[0] << "could not be locked to RAM"; } + installCrashHandler(argv[0]); #endif -#ifdef __linux__ - - installCrashHandler(argv[0]); -#endif - - boost::unordered_map paths; std::string ip_address; int ip_port, requested_num_threads; - // declare a group of options that will be allowed only on command line - boost::program_options::options_description generic_options("Options"); - generic_options.add_options() - ("version,v", "Show version") - ("help,h", "Show this help message") - ("config,c", boost::program_options::value(&paths["config"])->default_value("server.ini"), - "Path to a configuration file"); - - // declare a group of options that will be allowed both on command line and in config file - boost::program_options::options_description config_options("Configuration"); - config_options.add_options() - ("hsgrdata", boost::program_options::value(&paths["hsgrdata"]), - "HSGR file") - ("nodesdata", boost::program_options::value(&paths["nodesdata"]), - "Nodes file") - ("edgesdata", boost::program_options::value(&paths["edgesdata"]), - "Edges file") - ("ramindex", boost::program_options::value(&paths["ramindex"]), - "RAM index file") - ("fileindex", boost::program_options::value(&paths["fileindex"]), - "File index file") - ("namesdata", boost::program_options::value(&paths["namesdata"]), - "Names file") - ("timestamp", boost::program_options::value(&paths["timestamp"]), - "Timestamp file") - ("ip,i", boost::program_options::value(&ip_address)->default_value("0.0.0.0"), - "IP address") - ("port,p", boost::program_options::value(&ip_port)->default_value(5000), - "IP Port") - ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(8), - "Number of threads to use"); - - // hidden options, will be allowed both on command line and in config file, but will not be shown to the user - boost::program_options::options_description hidden_options("Hidden options"); - hidden_options.add_options() - ("base,b", boost::program_options::value(&paths["base"]), - "base path to .osrm file, other wil be located in the same folder"); - - // positional option - boost::program_options::positional_options_description positional_options; - positional_options.add("base", 1); - - // combine above options for parsing - boost::program_options::options_description cmdline_options; - cmdline_options.add(generic_options).add(config_options).add(hidden_options); - - boost::program_options::options_description config_file_options; - config_file_options.add(config_options).add(hidden_options); - - boost::program_options::options_description visible_options(boost::filesystem::basename(argv[0]) + " []"); - visible_options.add(generic_options).add(config_options); - - // parse command line options - boost::program_options::variables_map option_variables; - boost::program_options::store(boost::program_options::command_line_parser(argc, argv). - options(cmdline_options).positional(positional_options).run(), option_variables); - - if(option_variables.count("version")) { - SimpleLogger().Write() << g_GIT_DESCRIPTION; + ServerPaths server_paths; + if( !GenerateServerProgramOptions( + argc, + argv, + server_paths, + ip_address, + ip_port, + requested_num_threads + ) + ) { return 0; } - if(option_variables.count("help")) { - SimpleLogger().Write() << visible_options; - return 0; - } - - boost::program_options::notify(option_variables); - - // parse config file - if(boost::filesystem::is_regular_file(paths["config"])) { - SimpleLogger().Write() << "Reading options from: " << paths["config"].c_str(); - std::string config_str; - PrepareConfigFile( paths["config"], config_str ); - std::stringstream config_stream( config_str ); - boost::program_options::store(parse_config_file(config_stream, config_file_options), option_variables); - boost::program_options::notify(option_variables); - } - - if(!option_variables.count("hsgrdata")) { - if(!option_variables.count("base")) { - SimpleLogger().Write(logWARNING) << "hsgrdata (or base) must be specified"; - return -1; - } - paths["hsgrdata"] = std::string( paths["base"].c_str()) + ".hsgr"; - } - - if(!option_variables.count("nodesdata")) { - if(!option_variables.count("base")) { - SimpleLogger().Write(logWARNING) << "nodesdata (or base) must be specified"; - return -1; - } - paths["nodesdata"] = std::string( paths["base"].c_str()) + ".nodes"; - } - - if(!option_variables.count("edgesdata")) { - if(!option_variables.count("base")) { - SimpleLogger().Write(logWARNING) << "edgesdata (or base) must be specified"; - return -1; - } - paths["edgesdata"] = std::string( paths["base"].c_str()) + ".edges"; - } - - if(!option_variables.count("ramindex")) { - if(!option_variables.count("base")) { - SimpleLogger().Write(logWARNING) << "ramindex (or base) must be specified"; - return -1; - } - paths["ramindex"] = std::string( paths["base"].c_str()) + ".ramIndex"; - } - - if(!option_variables.count("fileindex")) { - if(!option_variables.count("base")) { - SimpleLogger().Write(logWARNING) << "fileindex (or base) must be specified"; - return -1; - } - paths["fileindex"] = std::string( paths["base"].c_str()) + ".fileIndex"; - } - - if(!option_variables.count("namesdata")) { - if(!option_variables.count("base")) { - SimpleLogger().Write(logWARNING) << "namesdata (or base) must be specified"; - return -1; - } - paths["namesdata"] = std::string( paths["base"].c_str()) + ".names"; - } - - if(!option_variables.count("timestamp")) { - if(!option_variables.count("base")) { - SimpleLogger().Write(logWARNING) << "timestamp (or base) must be specified"; - return -1; - } - paths["timestamp"] = std::string( paths["base"].c_str()) + ".timestamp"; - } - - if(1 > requested_num_threads) { - SimpleLogger().Write(logWARNING) << "Number of threads must be 1 or larger"; - return -1; - } - SimpleLogger().Write() << - "starting up engines, " << g_GIT_DESCRIPTION << ", compiled at " << __DATE__ << ", " __TIME__; - - SimpleLogger().Write() << "HSGR file:\t" << paths["hsgrdata"].c_str(); - SimpleLogger().Write() << "Nodes file:\t" << paths["nodesdata"].c_str(); - SimpleLogger().Write() << "Edges file:\t" << paths["edgesdata"].c_str(); - SimpleLogger().Write() << "RAM file:\t" << paths["ramindex"].c_str(); - SimpleLogger().Write() << "Index file:\t" << paths["fileindex"].c_str(); - SimpleLogger().Write() << "Names file:\t" << paths["namesdata"].c_str(); - SimpleLogger().Write() << "Timestamp file:\t" << paths["timestamp"].c_str(); - SimpleLogger().Write() << "Threads:\t" << requested_num_threads; - SimpleLogger().Write() << "IP address:\t" << ip_address; - SimpleLogger().Write() << "IP port:\t" << ip_port; + "starting up engines, " << g_GIT_DESCRIPTION << ", " << + "compiled at " << __DATE__ << ", " __TIME__; + + SimpleLogger().Write() << + "HSGR file:\t" << server_paths["hsgrdata"]; + SimpleLogger().Write() << + "Nodes file:\t" << server_paths["nodesdata"]; + SimpleLogger().Write() << + "Edges file:\t" << server_paths["edgesdata"]; + SimpleLogger().Write() << + "RAM file:\t" << server_paths["ramindex"]; + SimpleLogger().Write() << + "Index file:\t" << server_paths["fileindex"]; + SimpleLogger().Write() << + "Names file:\t" << server_paths["namesdata"]; + SimpleLogger().Write() << + "Timestamp file:\t" << server_paths["timestamp"]; + SimpleLogger().Write() << + "Threads:\t" << requested_num_threads; + SimpleLogger().Write() << + "IP address:\t" << ip_address; + SimpleLogger().Write() << + "IP port:\t" << ip_port; #ifndef _WIN32 int sig = 0; @@ -241,8 +121,12 @@ int main (int argc, char * argv[]) { pthread_sigmask(SIG_BLOCK, &new_mask, &old_mask); #endif - OSRM routing_machine(paths); - Server * s = ServerFactory::CreateServer(ip_address,ip_port,requested_num_threads); + OSRM routing_machine(server_paths); + Server * s = ServerFactory::CreateServer( + ip_address, + ip_port, + requested_num_threads + ); s->GetRequestHandlerPtr().RegisterRoutingMachine(&routing_machine); boost::thread t(boost::bind(&Server::Run, s)); @@ -264,7 +148,6 @@ int main (int argc, char * argv[]) { std::cout << "[server] running and waiting for requests" << std::endl; s->Run(); #endif - std::cout << "[server] initiating shutdown" << std::endl; s->Stop(); std::cout << "[server] stopping threads" << std::endl; From f73723f9af39884e65d71d067edc2d8dc53da904 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sat, 12 Oct 2013 15:20:32 +0200 Subject: [PATCH 29/36] link simple client against git descriptor --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4d66f368..0d17236b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,7 +161,7 @@ if(WITH_TOOLS) osrm-components ${GDAL_LIBRARIES} ${Boost_LIBRARIES} UUID ) endif(GDAL_FOUND) - add_executable ( osrm-cli Tools/simpleclient.cpp ) + add_executable ( osrm-cli Tools/simpleclient.cpp Util/GitDescription.cpp) target_link_libraries( osrm-cli ${Boost_LIBRARIES} OSRM UUID ) add_executable ( osrm-io-benchmark Tools/io-benchmark.cpp ) target_link_libraries( osrm-io-benchmark ${Boost_LIBRARIES} ) From 92196dc20775bc9e68d78fcd22e696dd47d333ea Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sat, 12 Oct 2013 15:20:58 +0200 Subject: [PATCH 30/36] pull config from program options --- Tools/simpleclient.cpp | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Tools/simpleclient.cpp b/Tools/simpleclient.cpp index a4588a5db..7bb53837d 100644 --- a/Tools/simpleclient.cpp +++ b/Tools/simpleclient.cpp @@ -44,13 +44,30 @@ void print_tree(boost::property_tree::ptree const& pt, const unsigned recursion_ } -int main (int argc, char * argv[]) { +int main (int argc, const char * argv[]) { LogPolicy::GetInstance().Unmute(); try { - std::cout << "\n starting up engines, compile at " - << __DATE__ << ", " __TIME__ << std::endl; - IniFile serverConfig((argc > 1 ? argv[1] : "server.ini")); - OSRM routing_machine((argc > 1 ? argv[1] : "server.ini")); + std::string ip_address; + int ip_port, requested_num_threads; + + ServerPaths server_paths; + if( !GenerateServerProgramOptions( + argc, + argv, + server_paths, + ip_address, + ip_port, + requested_num_threads + ) + ) { + return 0; + } + + SimpleLogger().Write() << + "starting up engines, " << g_GIT_DESCRIPTION << ", " << + "compiled at " << __DATE__ << ", " __TIME__; + + OSRM routing_machine(server_paths); RouteParameters route_parameters; route_parameters.zoomLevel = 18; //no generalization From 2a1c24763dc67fa1709aff2c189cf27efaf8a50f Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sat, 12 Oct 2013 15:21:36 +0200 Subject: [PATCH 31/36] fix path typo --- extractor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extractor.cpp b/extractor.cpp index 73c49ccc8..9fa3462e6 100644 --- a/extractor.cpp +++ b/extractor.cpp @@ -63,7 +63,7 @@ int main (int argc, char *argv[]) { config_options.add_options() ("profile,p", boost::program_options::value(&profile_path)->default_value("profile.lua"), "Path to LUA routing profile") - ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(8), + ("threads,t", boost::program_options::value(&requested_num_threads)->default_value(8), "Number of threads to use"); // hidden options, will be allowed both on command line and in config file, but will not be shown to the user @@ -200,7 +200,7 @@ int main (int argc, char *argv[]) { "s"; SimpleLogger().Write() << "To prepare the data for routing, run: " - << "osrm-prepare " << output_file_name << std::endl; + << "./osrm-prepare " << output_file_name << std::endl; } catch(boost::program_options::too_many_positional_options_error& e) { SimpleLogger().Write(logWARNING) << "Only one input file can be specified"; From 457519eae370f746d111e8b735e2417524a5ad43 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sun, 13 Oct 2013 14:13:08 +0200 Subject: [PATCH 32/36] Fixes resource leaks and removes deprecated c_str() calls where possible --- Server/DataStructures/QueryObjectsStorage.cpp | 72 +++++++++++++------ Server/DataStructures/QueryObjectsStorage.h | 5 +- Util/ProgramOptions.h | 17 +++-- 3 files changed, 63 insertions(+), 31 deletions(-) diff --git a/Server/DataStructures/QueryObjectsStorage.cpp b/Server/DataStructures/QueryObjectsStorage.cpp index d99aed555..4ece2b62a 100644 --- a/Server/DataStructures/QueryObjectsStorage.cpp +++ b/Server/DataStructures/QueryObjectsStorage.cpp @@ -21,32 +21,37 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "QueryObjectsStorage.h" -QueryObjectsStorage::QueryObjectsStorage(boost::unordered_map& paths) { - if( paths["hsgrdata"].empty() ) { +QueryObjectsStorage::QueryObjectsStorage( const ServerPaths & paths ) { + if( paths.find("hsgrdata") == paths.end() ) { throw OSRMException("no hsgr file given in ini file"); } - if( paths["ramindex"].empty() ) { + if( paths.find("ramindex") == paths.end() ) { throw OSRMException("no ram index file given in ini file"); } - if( paths["fileindex"].empty() ) { + if( paths.find("fileindex") == paths.end() ) { throw OSRMException("no mem index file given in ini file"); } - if( paths["nodesdata"].empty() ) { + if( paths.find("nodesdata") == paths.end() ) { throw OSRMException("no nodes file given in ini file"); } - if( paths["edgesdata"].empty() ) { + if( paths.find("edgesdata") == paths.end() ) { throw OSRMException("no edges file given in ini file"); } - if( paths["namesdata"].empty() ) { + if( paths.find("namesdata") == paths.end() ) { throw OSRMException("no names file given in ini file"); } SimpleLogger().Write() << "loading graph data"; //Deserialize road network graph + + ServerPaths::const_iterator paths_iterator = paths.find("hsgrdata"); + BOOST_ASSERT(paths.end() != paths_iterator); + const std::string & hsgr_data_string = paths_iterator->second.string(); + std::vector< QueryGraph::_StrNode> node_list; std::vector< QueryGraph::_StrEdge> edge_list; const int number_of_nodes = readHSGRFromStream( - paths["hsgrdata"].c_str(), + hsgr_data_string, node_list, edge_list, &check_sum @@ -54,18 +59,22 @@ QueryObjectsStorage::QueryObjectsStorage(boost::unordered_mapsecond.string(); + + boost::filesystem::ifstream time_stamp_instream(timestamp_string); + if( !time_stamp_instream.good() ) { + SimpleLogger().Write(logWARNING) << timestamp_string << " not found"; } - getline(timestampInStream, timestamp); - timestampInStream.close(); + getline(time_stamp_instream, timestamp); + time_stamp_instream.close(); } if(!timestamp.length()) { timestamp = "n/a"; @@ -75,12 +84,26 @@ QueryObjectsStorage::QueryObjectsStorage(boost::unordered_mapsecond.string(); + paths_iterator = paths.find("fileindex"); + BOOST_ASSERT(paths.end() != paths_iterator); + const std::string & file_index_string = paths_iterator->second.string(); + paths_iterator = paths.find("nodesdata"); + BOOST_ASSERT(paths.end() != paths_iterator); + const std::string & nodes_data_string = paths_iterator->second.string(); + paths_iterator = paths.find("edgesdata"); + BOOST_ASSERT(paths.end() != paths_iterator); + const std::string & edges_data_string = paths_iterator->second.string(); + //Init nearest neighbor data structure nodeHelpDesk = new NodeInformationHelpDesk( - paths["ramindex"].c_str(), - paths["fileindex"].c_str(), - paths["nodesdata"].c_str(), - paths["edgesdata"].c_str(), + ram_index_string, + file_index_string, + nodes_data_string, + edges_data_string, number_of_nodes, check_sum ); @@ -88,14 +111,17 @@ QueryObjectsStorage::QueryObjectsStorage(boost::unordered_mapsecond.string(); + if ( !boost::filesystem::exists( paths_iterator->second ) ) { throw OSRMException("names file does not exist"); } - if ( 0 == boost::filesystem::file_size( paths["namesdata"] ) ) { + if ( 0 == boost::filesystem::file_size( paths_iterator->second ) ) { throw OSRMException("names file is empty"); } - boost::filesystem::ifstream name_stream(paths["namesdata"], std::ios::binary); + boost::filesystem::ifstream name_stream(names_data_string, std::ios::binary); unsigned size = 0; name_stream.read((char *)&size, sizeof(unsigned)); BOOST_ASSERT_MSG(0 != size, "name file broken"); diff --git a/Server/DataStructures/QueryObjectsStorage.h b/Server/DataStructures/QueryObjectsStorage.h index a2d3a58c1..c81b62d74 100644 --- a/Server/DataStructures/QueryObjectsStorage.h +++ b/Server/DataStructures/QueryObjectsStorage.h @@ -24,6 +24,7 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "../../Util/GraphLoader.h" #include "../../Util/OSRMException.h" +#include "../../Util/ProgramOptions.h" #include "../../Util/SimpleLogger.h" #include "../../DataStructures/NodeInformationHelpDesk.h" #include "../../DataStructures/QueryEdge.h" @@ -48,9 +49,9 @@ struct QueryObjectsStorage { std::string timestamp; unsigned check_sum; - void GetName(const unsigned name_id, std::string & result) const; + void GetName( const unsigned name_id, std::string & result ) const; - QueryObjectsStorage(boost::unordered_map& paths); + QueryObjectsStorage( const ServerPaths & paths ); ~QueryObjectsStorage(); }; diff --git a/Util/ProgramOptions.h b/Util/ProgramOptions.h index 562182df7..6872f53c8 100644 --- a/Util/ProgramOptions.h +++ b/Util/ProgramOptions.h @@ -49,7 +49,7 @@ namespace boost { // exists. The validate() function must be defined in the same namespace // as the target type, (boost::filesystem::path in this case), otherwise // it is not be called - void validate( + inline void validate( boost::any & v, const std::vector & values, boost::filesystem::path *, @@ -86,7 +86,7 @@ inline void PrepareConfigFile( // generate boost::program_options object for the routing part -bool GenerateServerProgramOptions( +inline bool GenerateServerProgramOptions( const int argc, const char * argv[], ServerPaths & paths, @@ -204,13 +204,18 @@ bool GenerateServerProgramOptions( boost::program_options::notify(option_variables); // parse config file - if(boost::filesystem::is_regular_file(paths["config"])) { + ServerPaths::const_iterator path_iterator = paths.find("config"); + if( path_iterator != paths.end() && + boost::filesystem::is_regular_file(path_iterator->second)) { SimpleLogger().Write() << - "Reading options from: " << paths["config"].c_str(); + "Reading options from: " << path_iterator->second.string(); std::string config_str; PrepareConfigFile( paths["config"], config_str ); std::stringstream config_stream( config_str ); - boost::program_options::store(parse_config_file(config_stream, config_file_options), option_variables); + boost::program_options::store( + parse_config_file(config_stream, config_file_options), + option_variables + ); boost::program_options::notify(option_variables); } @@ -218,7 +223,7 @@ bool GenerateServerProgramOptions( if(!option_variables.count("base")) { throw OSRMException("hsgrdata (or base) must be specified"); } - paths["hsgrdata"] = std::string( paths["base"].c_str()) + ".hsgr"; + paths["hsgrdata"] = std::string( paths["base"].string()) + ".hsgr"; } if(!option_variables.count("nodesdata")) { From 467cf73635280c99a9a9facb64979e7dea9d47f0 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sun, 13 Oct 2013 14:26:42 +0200 Subject: [PATCH 33/36] load timestamp properly --- Server/DataStructures/QueryObjectsStorage.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Server/DataStructures/QueryObjectsStorage.cpp b/Server/DataStructures/QueryObjectsStorage.cpp index 4ece2b62a..84eee3f81 100644 --- a/Server/DataStructures/QueryObjectsStorage.cpp +++ b/Server/DataStructures/QueryObjectsStorage.cpp @@ -62,7 +62,7 @@ QueryObjectsStorage::QueryObjectsStorage( const ServerPaths & paths ) { BOOST_ASSERT(0 == node_list.size()); BOOST_ASSERT(0 == edge_list.size()); - paths_iterator = paths.find("hsgrdata"); + paths_iterator = paths.find("timestamp"); if(paths.end() != paths_iterator) { SimpleLogger().Write() << "Loading Timestamp"; @@ -82,7 +82,6 @@ QueryObjectsStorage::QueryObjectsStorage( const ServerPaths & paths ) { if(25 < timestamp.length()) { timestamp.resize(25); } - SimpleLogger().Write() << "Loading auxiliary information"; paths_iterator = paths.find("ramindex"); From 18d8968ae71333dc53255faf4e601ff8706f4288 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sun, 13 Oct 2013 17:55:50 +0200 Subject: [PATCH 34/36] add C include for NULL --- DataStructures/DeallocatingVector.h | 1 + 1 file changed, 1 insertion(+) diff --git a/DataStructures/DeallocatingVector.h b/DataStructures/DeallocatingVector.h index 89d8e2ce7..060fda0b9 100644 --- a/DataStructures/DeallocatingVector.h +++ b/DataStructures/DeallocatingVector.h @@ -22,6 +22,7 @@ or see http://www.gnu.org/licenses/agpl.txt. #define DEALLOCATINGVECTOR_H_ #include +#include #include #if __cplusplus > 199711L From 29499f21c5e904bee66fba86c008066316212baf Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 14 Oct 2013 13:42:28 +0200 Subject: [PATCH 35/36] License change to (simplified) 2-clause BSD. Good riddance, AGPL --- Algorithms/Bresenham.h | 37 +- Algorithms/CRC32.cpp | 37 +- Algorithms/CRC32.h | 37 +- Algorithms/DouglasPeucker.h | 37 +- Algorithms/IteratorBasedCRC32.h | 36 +- Algorithms/ObjectToBase64.h | 37 +- Algorithms/PolylineCompressor.h | 37 +- Algorithms/StronglyConnectedComponents.h | 36 +- Contractor/Contractor.h | 37 +- Contractor/EdgeBasedGraphFactory.cpp | 37 +- Contractor/EdgeBasedGraphFactory.h | 37 +- Contractor/TemporaryStorage.cpp | 37 +- Contractor/TemporaryStorage.h | 37 +- DataStructures/BinaryHeap.h | 37 +- DataStructures/ConcurrentQueue.h | 37 +- DataStructures/Coordinate.h | 37 +- DataStructures/DeallocatingVector.h | 37 +- DataStructures/DynamicGraph.h | 37 +- DataStructures/HashTable.h | 38 +- DataStructures/HilbertValue.h | 37 +- DataStructures/ImportEdge.h | 37 +- DataStructures/ImportNode.h | 37 +- DataStructures/InputReaderFactory.h | 38 +- DataStructures/LRUCache.h | 37 +- DataStructures/MercatorUtil.h | 35 +- DataStructures/NodeInformationHelpDesk.h | 38 +- DataStructures/Percent.h | 43 +- DataStructures/PhantomNodes.h | 37 +- DataStructures/QueryEdge.h | 37 +- DataStructures/QueryNode.h | 37 +- DataStructures/RawRouteData.h | 37 +- DataStructures/Restriction.h | 35 +- DataStructures/SearchEngine.cpp | 37 +- DataStructures/SearchEngine.h | 37 +- DataStructures/SearchEngineData.cpp | 37 +- DataStructures/SearchEngineData.h | 37 +- DataStructures/SegmentInformation.h | 38 +- DataStructures/SimpleStack.h | 37 +- DataStructures/StaticGraph.h | 37 +- DataStructures/StaticKDTree.h | 39 +- DataStructures/StaticRTree.h | 37 +- DataStructures/TurnInstructions.h | 37 +- DataStructures/XORFastHash.h | 37 +- DataStructures/XORFastHashStorage.h | 37 +- Descriptors/BaseDescriptor.h | 37 +- Descriptors/DescriptionFactory.cpp | 37 +- Descriptors/DescriptionFactory.h | 37 +- Descriptors/GPXDescriptor.h | 37 +- Descriptors/JSONDescriptor.h | 37 +- Extractor/BaseParser.cpp | 35 +- Extractor/BaseParser.h | 37 +- Extractor/ExtractionContainers.cpp | 37 +- Extractor/ExtractionContainers.h | 37 +- Extractor/ExtractionHelperFunctions.h | 37 +- Extractor/ExtractorCallbacks.cpp | 36 +- Extractor/ExtractorCallbacks.h | 37 +- Extractor/ExtractorStructs.h | 37 +- Extractor/PBFParser.cpp | 37 +- Extractor/PBFParser.h | 37 +- Extractor/ScriptingEnvironment.cpp | 37 +- Extractor/ScriptingEnvironment.h | 37 +- Extractor/XMLParser.cpp | 37 +- Extractor/XMLParser.h | 37 +- LICENCE.TXT | 683 +----------------- Library/OSRM.cpp | 37 +- Library/OSRM.h | 37 +- Plugins/BasePlugin.h | 37 +- Plugins/HelloWorldPlugin.h | 37 +- Plugins/LocatePlugin.h | 37 +- Plugins/NearestPlugin.h | 37 +- Plugins/TimestampPlugin.h | 37 +- Plugins/ViaRoutePlugin.h | 37 +- RoutingAlgorithms/AlternativePathRouting.h | 37 +- RoutingAlgorithms/BasicRoutingInterface.h | 35 +- RoutingAlgorithms/ShortestPathRouting.h | 35 +- Server/APIGrammar.h | 35 +- Server/BasicDatastructures.h | 35 +- Server/Connection.h | 37 +- Server/DataStructures/QueryObjectsStorage.cpp | 36 +- Server/DataStructures/QueryObjectsStorage.h | 36 +- Server/DataStructures/RouteParameters.h | 37 +- Server/RequestHandler.h | 37 +- Server/RequestParser.h | 37 +- Server/Server.h | 37 +- Server/ServerFactory.h | 37 +- Tools/componentAnalysis.cpp | 37 +- Tools/io-benchmark.cpp | 37 +- Tools/simpleclient.cpp | 36 +- Util/Azimuth.h | 35 +- Util/ContainerUtils.h | 30 +- Util/GitDescription.cpp.in | 37 +- Util/GitDescription.h | 37 +- Util/GraphLoader.h | 37 +- Util/IniFile.h | 37 +- Util/InputFileUtil.h | 38 +- Util/LinuxStackTrace.h | 35 +- Util/LuaUtil.h | 37 +- Util/MachineInfo.h | 37 +- Util/OSRMException.h | 37 +- Util/OpenMPWrapper.h | 40 +- Util/ProgramOptions.h | 34 +- Util/SimpleLogger.h | 36 +- Util/StringUtil.h | 37 +- Util/TimingUtil.h | 35 +- Util/UUID.cpp.in | 37 +- Util/UUID.h | 37 +- cmake/size.cpp | 28 +- createHierarchy.cpp | 37 +- extractor.cpp | 37 +- routed.cpp | 36 +- typedefs.h | 37 +- 111 files changed, 2429 insertions(+), 2293 deletions(-) diff --git a/Algorithms/Bresenham.h b/Algorithms/Bresenham.h index 60eed7228..d55845525 100644 --- a/Algorithms/Bresenham.h +++ b/Algorithms/Bresenham.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef BRESENHAM_H_ #define BRESENHAM_H_ diff --git a/Algorithms/CRC32.cpp b/Algorithms/CRC32.cpp index cb72e85c6..57c8aa0d0 100644 --- a/Algorithms/CRC32.cpp +++ b/Algorithms/CRC32.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "CRC32.h" diff --git a/Algorithms/CRC32.h b/Algorithms/CRC32.h index fb7e50613..cc329db41 100644 --- a/Algorithms/CRC32.h +++ b/Algorithms/CRC32.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef CRC32_H_ #define CRC32_H_ diff --git a/Algorithms/DouglasPeucker.h b/Algorithms/DouglasPeucker.h index dd910b9c8..b0b4d5c54 100644 --- a/Algorithms/DouglasPeucker.h +++ b/Algorithms/DouglasPeucker.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef DOUGLASPEUCKER_H_ #define DOUGLASPEUCKER_H_ diff --git a/Algorithms/IteratorBasedCRC32.h b/Algorithms/IteratorBasedCRC32.h index 55a8f8084..4f012b06b 100644 --- a/Algorithms/IteratorBasedCRC32.h +++ b/Algorithms/IteratorBasedCRC32.h @@ -1,23 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef ITERATORBASEDCRC32_H_ #define ITERATORBASEDCRC32_H_ diff --git a/Algorithms/ObjectToBase64.h b/Algorithms/ObjectToBase64.h index 9c0d5377d..d0dfe3cb3 100644 --- a/Algorithms/ObjectToBase64.h +++ b/Algorithms/ObjectToBase64.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef OBJECTTOBASE64_H_ #define OBJECTTOBASE64_H_ diff --git a/Algorithms/PolylineCompressor.h b/Algorithms/PolylineCompressor.h index 3e14c6639..6387be71a 100644 --- a/Algorithms/PolylineCompressor.h +++ b/Algorithms/PolylineCompressor.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef POLYLINECOMPRESSOR_H_ #define POLYLINECOMPRESSOR_H_ diff --git a/Algorithms/StronglyConnectedComponents.h b/Algorithms/StronglyConnectedComponents.h index 95137dac0..d3a1b3cd7 100644 --- a/Algorithms/StronglyConnectedComponents.h +++ b/Algorithms/StronglyConnectedComponents.h @@ -1,25 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. -Strongly connected components using Tarjan's Algorithm +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +*/ #ifndef STRONGLYCONNECTEDCOMPONENTS_H_ #define STRONGLYCONNECTEDCOMPONENTS_H_ diff --git a/Contractor/Contractor.h b/Contractor/Contractor.h index 8701af625..976cd9124 100644 --- a/Contractor/Contractor.h +++ b/Contractor/Contractor.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef CONTRACTOR_H_INCLUDED #define CONTRACTOR_H_INCLUDED diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp index 6054db470..32389f1f2 100644 --- a/Contractor/EdgeBasedGraphFactory.cpp +++ b/Contractor/EdgeBasedGraphFactory.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "EdgeBasedGraphFactory.h" diff --git a/Contractor/EdgeBasedGraphFactory.h b/Contractor/EdgeBasedGraphFactory.h index 5f4df157b..33ed8fdef 100644 --- a/Contractor/EdgeBasedGraphFactory.h +++ b/Contractor/EdgeBasedGraphFactory.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ // This class constructs the edge-expanded routing graph diff --git a/Contractor/TemporaryStorage.cpp b/Contractor/TemporaryStorage.cpp index 6c32ba176..0a4fcb6ae 100644 --- a/Contractor/TemporaryStorage.cpp +++ b/Contractor/TemporaryStorage.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "TemporaryStorage.h" diff --git a/Contractor/TemporaryStorage.h b/Contractor/TemporaryStorage.h index feebc3552..214d0b325 100644 --- a/Contractor/TemporaryStorage.h +++ b/Contractor/TemporaryStorage.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef TEMPORARYSTORAGE_H_ #define TEMPORARYSTORAGE_H_ diff --git a/DataStructures/BinaryHeap.h b/DataStructures/BinaryHeap.h index b1e838b8f..e31a69fef 100644 --- a/DataStructures/BinaryHeap.h +++ b/DataStructures/BinaryHeap.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef BINARYHEAP_H_INCLUDED #define BINARYHEAP_H_INCLUDED diff --git a/DataStructures/ConcurrentQueue.h b/DataStructures/ConcurrentQueue.h index bfdfae8d8..ea52ef864 100644 --- a/DataStructures/ConcurrentQueue.h +++ b/DataStructures/ConcurrentQueue.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef CONCURRENTQUEUE_H_ #define CONCURRENTQUEUE_H_ diff --git a/DataStructures/Coordinate.h b/DataStructures/Coordinate.h index e6a6ce575..dcd687388 100644 --- a/DataStructures/Coordinate.h +++ b/DataStructures/Coordinate.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef FIXED_POINT_COORDINATE_H_ #define FIXED_POINT_COORDINATE_H_ diff --git a/DataStructures/DeallocatingVector.h b/DataStructures/DeallocatingVector.h index 060fda0b9..3b706818d 100644 --- a/DataStructures/DeallocatingVector.h +++ b/DataStructures/DeallocatingVector.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef DEALLOCATINGVECTOR_H_ #define DEALLOCATINGVECTOR_H_ diff --git a/DataStructures/DynamicGraph.h b/DataStructures/DynamicGraph.h index 89baee882..b4502d9e6 100644 --- a/DataStructures/DynamicGraph.h +++ b/DataStructures/DynamicGraph.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef DYNAMICGRAPH_H_INCLUDED #define DYNAMICGRAPH_H_INCLUDED diff --git a/DataStructures/HashTable.h b/DataStructures/HashTable.h index f6bd786cb..f1c5a3210 100644 --- a/DataStructures/HashTable.h +++ b/DataStructures/HashTable.h @@ -1,25 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. - Created on: 18.11.2010 - Author: dennis - */ +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef HASHTABLE_H_ #define HASHTABLE_H_ diff --git a/DataStructures/HilbertValue.h b/DataStructures/HilbertValue.h index f73396928..d0d49f655 100644 --- a/DataStructures/HilbertValue.h +++ b/DataStructures/HilbertValue.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef HILBERTVALUE_H_ #define HILBERTVALUE_H_ diff --git a/DataStructures/ImportEdge.h b/DataStructures/ImportEdge.h index 38656d16b..23e30e2fb 100644 --- a/DataStructures/ImportEdge.h +++ b/DataStructures/ImportEdge.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef IMPORT_EDGE_H #define IMPORT_EDGE_H diff --git a/DataStructures/ImportNode.h b/DataStructures/ImportNode.h index d1eb1dd28..70167be4c 100644 --- a/DataStructures/ImportNode.h +++ b/DataStructures/ImportNode.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef IMPORTNODE_H_ #define IMPORTNODE_H_ diff --git a/DataStructures/InputReaderFactory.h b/DataStructures/InputReaderFactory.h index f58232f79..26418c1f2 100644 --- a/DataStructures/InputReaderFactory.h +++ b/DataStructures/InputReaderFactory.h @@ -1,22 +1,30 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ #ifndef INPUTREADERFACTORY_H #define INPUTREADERFACTORY_H diff --git a/DataStructures/LRUCache.h b/DataStructures/LRUCache.h index a2c0b130d..8e7733171 100644 --- a/DataStructures/LRUCache.h +++ b/DataStructures/LRUCache.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef LRUCACHE_H #define LRUCACHE_H diff --git a/DataStructures/MercatorUtil.h b/DataStructures/MercatorUtil.h index 15bea275a..bc708e393 100644 --- a/DataStructures/MercatorUtil.h +++ b/DataStructures/MercatorUtil.h @@ -1,21 +1,28 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. */ #ifndef MERCATORUTIL_H_ diff --git a/DataStructures/NodeInformationHelpDesk.h b/DataStructures/NodeInformationHelpDesk.h index 120f11ff6..08b1a272d 100644 --- a/DataStructures/NodeInformationHelpDesk.h +++ b/DataStructures/NodeInformationHelpDesk.h @@ -1,22 +1,30 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ #ifndef NODEINFORMATIONHELPDESK_H_ #define NODEINFORMATIONHELPDESK_H_ diff --git a/DataStructures/Percent.h b/DataStructures/Percent.h index b5b909970..dc2e7d0f4 100644 --- a/DataStructures/Percent.h +++ b/DataStructures/Percent.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef PERCENT_H #define PERCENT_H @@ -24,8 +31,7 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "../Util/OpenMPWrapper.h" #include -class Percent -{ +class Percent { public: /** * Constructor. @@ -56,8 +62,7 @@ public: std::cout << " 100%" << std::endl; } - void printIncrement() - { + void printIncrement() { #pragma omp atomic ++_current_value; printStatus(_current_value); diff --git a/DataStructures/PhantomNodes.h b/DataStructures/PhantomNodes.h index d48d61797..bf7317a52 100644 --- a/DataStructures/PhantomNodes.h +++ b/DataStructures/PhantomNodes.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef PHANTOMNODES_H_ #define PHANTOMNODES_H_ diff --git a/DataStructures/QueryEdge.h b/DataStructures/QueryEdge.h index 1a7c39223..53a671616 100644 --- a/DataStructures/QueryEdge.h +++ b/DataStructures/QueryEdge.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef QUERYEDGE_H_ #define QUERYEDGE_H_ diff --git a/DataStructures/QueryNode.h b/DataStructures/QueryNode.h index 6e9386efb..011d43552 100644 --- a/DataStructures/QueryNode.h +++ b/DataStructures/QueryNode.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef _NODE_COORDS_H #define _NODE_COORDS_H diff --git a/DataStructures/RawRouteData.h b/DataStructures/RawRouteData.h index 7607e3300..d1aa21d3c 100644 --- a/DataStructures/RawRouteData.h +++ b/DataStructures/RawRouteData.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef RAWROUTEDATA_H_ #define RAWROUTEDATA_H_ diff --git a/DataStructures/Restriction.h b/DataStructures/Restriction.h index 2693700e7..d75204a5e 100644 --- a/DataStructures/Restriction.h +++ b/DataStructures/Restriction.h @@ -1,24 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ #ifndef RESTRICTION_H_ #define RESTRICTION_H_ diff --git a/DataStructures/SearchEngine.cpp b/DataStructures/SearchEngine.cpp index 334acc42a..a6cf1f838 100644 --- a/DataStructures/SearchEngine.cpp +++ b/DataStructures/SearchEngine.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "SearchEngine.h" diff --git a/DataStructures/SearchEngine.h b/DataStructures/SearchEngine.h index 3aad89b22..0d7d35dbe 100644 --- a/DataStructures/SearchEngine.h +++ b/DataStructures/SearchEngine.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef SEARCHENGINE_H_ #define SEARCHENGINE_H_ diff --git a/DataStructures/SearchEngineData.cpp b/DataStructures/SearchEngineData.cpp index afb5241d9..611da5b91 100644 --- a/DataStructures/SearchEngineData.cpp +++ b/DataStructures/SearchEngineData.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "SearchEngineData.h" diff --git a/DataStructures/SearchEngineData.h b/DataStructures/SearchEngineData.h index 90c157d29..128cc092e 100644 --- a/DataStructures/SearchEngineData.h +++ b/DataStructures/SearchEngineData.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "BinaryHeap.h" #include "QueryEdge.h" diff --git a/DataStructures/SegmentInformation.h b/DataStructures/SegmentInformation.h index 20e5e05d8..c99690517 100644 --- a/DataStructures/SegmentInformation.h +++ b/DataStructures/SegmentInformation.h @@ -1,26 +1,34 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef SEGMENTINFORMATION_H_ #define SEGMENTINFORMATION_H_ +#include "Coordinate.h" #include "TurnInstructions.h" #include "../typedefs.h" diff --git a/DataStructures/SimpleStack.h b/DataStructures/SimpleStack.h index 0335bcccb..10a98ff9c 100644 --- a/DataStructures/SimpleStack.h +++ b/DataStructures/SimpleStack.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef SIMPLESTACK_H_ #define SIMPLESTACK_H_ diff --git a/DataStructures/StaticGraph.h b/DataStructures/StaticGraph.h index 6a5d0a6a8..9b83ab944 100644 --- a/DataStructures/StaticGraph.h +++ b/DataStructures/StaticGraph.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef STATICGRAPH_H_INCLUDED #define STATICGRAPH_H_INCLUDED diff --git a/DataStructures/StaticKDTree.h b/DataStructures/StaticKDTree.h index 85ffb809f..1ad6f9597 100644 --- a/DataStructures/StaticKDTree.h +++ b/DataStructures/StaticKDTree.h @@ -1,25 +1,32 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. -KD Tree coded by Christian Vetter, Monav Project +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ + +// KD Tree coded by Christian Vetter, Monav Project - */ #ifndef STATICKDTREE_H_INCLUDED #define STATICKDTREE_H_INCLUDED diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 522019073..ad9959231 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef STATICRTREE_H_ #define STATICRTREE_H_ diff --git a/DataStructures/TurnInstructions.h b/DataStructures/TurnInstructions.h index 3284d9bbe..4a80ccfc2 100644 --- a/DataStructures/TurnInstructions.h +++ b/DataStructures/TurnInstructions.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef TURNINSTRUCTIONS_H_ #define TURNINSTRUCTIONS_H_ diff --git a/DataStructures/XORFastHash.h b/DataStructures/XORFastHash.h index c3c14702b..2ed199e19 100644 --- a/DataStructures/XORFastHash.h +++ b/DataStructures/XORFastHash.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef FASTXORHASH_H_ #define FASTXORHASH_H_ diff --git a/DataStructures/XORFastHashStorage.h b/DataStructures/XORFastHashStorage.h index 1998f2832..e4e930fd9 100644 --- a/DataStructures/XORFastHashStorage.h +++ b/DataStructures/XORFastHashStorage.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef XORFASTHASHSTORAGE_H_ #define XORFASTHASHSTORAGE_H_ diff --git a/Descriptors/BaseDescriptor.h b/Descriptors/BaseDescriptor.h index 0d1359a10..d185be8c8 100644 --- a/Descriptors/BaseDescriptor.h +++ b/Descriptors/BaseDescriptor.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef BASE_DESCRIPTOR_H_ #define BASE_DESCRIPTOR_H_ diff --git a/Descriptors/DescriptionFactory.cpp b/Descriptors/DescriptionFactory.cpp index 18ac015ae..67066fbd0 100644 --- a/Descriptors/DescriptionFactory.cpp +++ b/Descriptors/DescriptionFactory.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "DescriptionFactory.h" diff --git a/Descriptors/DescriptionFactory.h b/Descriptors/DescriptionFactory.h index 35f0ff172..0fa3e5308 100644 --- a/Descriptors/DescriptionFactory.h +++ b/Descriptors/DescriptionFactory.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef DESCRIPTIONFACTORY_H_ #define DESCRIPTIONFACTORY_H_ diff --git a/Descriptors/GPXDescriptor.h b/Descriptors/GPXDescriptor.h index 9c3caa77b..af1a47aad 100644 --- a/Descriptors/GPXDescriptor.h +++ b/Descriptors/GPXDescriptor.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef GPX_DESCRIPTOR_H_ #define GPX_DESCRIPTOR_H_ diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h index a45d478ed..f89304f99 100644 --- a/Descriptors/JSONDescriptor.h +++ b/Descriptors/JSONDescriptor.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef JSON_DESCRIPTOR_H_ #define JSON_DESCRIPTOR_H_ diff --git a/Extractor/BaseParser.cpp b/Extractor/BaseParser.cpp index 7885b095b..7b1ab140f 100644 --- a/Extractor/BaseParser.cpp +++ b/Extractor/BaseParser.cpp @@ -1,21 +1,28 @@ /* -open source routing machine -Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. */ #include "BaseParser.h" diff --git a/Extractor/BaseParser.h b/Extractor/BaseParser.h index 64228b53d..a59073f03 100644 --- a/Extractor/BaseParser.h +++ b/Extractor/BaseParser.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef BASEPARSER_H_ #define BASEPARSER_H_ diff --git a/Extractor/ExtractionContainers.cpp b/Extractor/ExtractionContainers.cpp index a21b45163..58f00252e 100644 --- a/Extractor/ExtractionContainers.cpp +++ b/Extractor/ExtractionContainers.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "ExtractionContainers.h" diff --git a/Extractor/ExtractionContainers.h b/Extractor/ExtractionContainers.h index 378223736..460a7c19c 100644 --- a/Extractor/ExtractionContainers.h +++ b/Extractor/ExtractionContainers.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef EXTRACTIONCONTAINERS_H_ #define EXTRACTIONCONTAINERS_H_ diff --git a/Extractor/ExtractionHelperFunctions.h b/Extractor/ExtractionHelperFunctions.h index 0c654d141..c0b74bdb3 100644 --- a/Extractor/ExtractionHelperFunctions.h +++ b/Extractor/ExtractionHelperFunctions.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef EXTRACTIONHELPERFUNCTIONS_H_ #define EXTRACTIONHELPERFUNCTIONS_H_ diff --git a/Extractor/ExtractorCallbacks.cpp b/Extractor/ExtractorCallbacks.cpp index 4331f8dc8..c61f408ae 100644 --- a/Extractor/ExtractorCallbacks.cpp +++ b/Extractor/ExtractorCallbacks.cpp @@ -1,23 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "ExtractorCallbacks.h" diff --git a/Extractor/ExtractorCallbacks.h b/Extractor/ExtractorCallbacks.h index b175f76fa..6b0c434be 100644 --- a/Extractor/ExtractorCallbacks.h +++ b/Extractor/ExtractorCallbacks.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef EXTRACTORCALLBACKS_H_ #define EXTRACTORCALLBACKS_H_ diff --git a/Extractor/ExtractorStructs.h b/Extractor/ExtractorStructs.h index 90251fcb0..73a4df628 100644 --- a/Extractor/ExtractorStructs.h +++ b/Extractor/ExtractorStructs.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef EXTRACTORSTRUCTS_H_ #define EXTRACTORSTRUCTS_H_ diff --git a/Extractor/PBFParser.cpp b/Extractor/PBFParser.cpp index a6085a08c..ab5e17413 100644 --- a/Extractor/PBFParser.cpp +++ b/Extractor/PBFParser.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "PBFParser.h" diff --git a/Extractor/PBFParser.h b/Extractor/PBFParser.h index c8282f26b..b726fa407 100644 --- a/Extractor/PBFParser.h +++ b/Extractor/PBFParser.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef PBFPARSER_H_ #define PBFPARSER_H_ diff --git a/Extractor/ScriptingEnvironment.cpp b/Extractor/ScriptingEnvironment.cpp index fba59f89d..d25a003aa 100644 --- a/Extractor/ScriptingEnvironment.cpp +++ b/Extractor/ScriptingEnvironment.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "ScriptingEnvironment.h" diff --git a/Extractor/ScriptingEnvironment.h b/Extractor/ScriptingEnvironment.h index fc4b97e1a..3e00f4c73 100644 --- a/Extractor/ScriptingEnvironment.h +++ b/Extractor/ScriptingEnvironment.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef SCRIPTINGENVIRONMENT_H_ #define SCRIPTINGENVIRONMENT_H_ diff --git a/Extractor/XMLParser.cpp b/Extractor/XMLParser.cpp index 2ab6e7335..551bf7f34 100644 --- a/Extractor/XMLParser.cpp +++ b/Extractor/XMLParser.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "XMLParser.h" diff --git a/Extractor/XMLParser.h b/Extractor/XMLParser.h index 51b7b1b1e..b6d8613f9 100644 --- a/Extractor/XMLParser.h +++ b/Extractor/XMLParser.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef XMLPARSER_H_ #define XMLPARSER_H_ diff --git a/LICENCE.TXT b/LICENCE.TXT index dba13ed2d..28fe97b35 100644 --- a/LICENCE.TXT +++ b/LICENCE.TXT @@ -1,661 +1,22 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Library/OSRM.cpp b/Library/OSRM.cpp index 3c56ac6cd..063c81d6b 100644 --- a/Library/OSRM.cpp +++ b/Library/OSRM.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "OSRM.h" #include diff --git a/Library/OSRM.h b/Library/OSRM.h index 515bfd3ed..ce12186ae 100644 --- a/Library/OSRM.h +++ b/Library/OSRM.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef OSRM_H #define OSRM_H diff --git a/Plugins/BasePlugin.h b/Plugins/BasePlugin.h index f359942af..265c8e87b 100644 --- a/Plugins/BasePlugin.h +++ b/Plugins/BasePlugin.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef BASEPLUGIN_H_ #define BASEPLUGIN_H_ diff --git a/Plugins/HelloWorldPlugin.h b/Plugins/HelloWorldPlugin.h index 7c2987ecf..33efb64e0 100644 --- a/Plugins/HelloWorldPlugin.h +++ b/Plugins/HelloWorldPlugin.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef HELLOWORLDPLUGIN_H_ #define HELLOWORLDPLUGIN_H_ diff --git a/Plugins/LocatePlugin.h b/Plugins/LocatePlugin.h index 22a5ac3c5..fdef0cab4 100644 --- a/Plugins/LocatePlugin.h +++ b/Plugins/LocatePlugin.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef LOCATEPLUGIN_H_ #define LOCATEPLUGIN_H_ diff --git a/Plugins/NearestPlugin.h b/Plugins/NearestPlugin.h index 1f011bd4b..36433a5ce 100644 --- a/Plugins/NearestPlugin.h +++ b/Plugins/NearestPlugin.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef NearestPlugin_H_ #define NearestPlugin_H_ diff --git a/Plugins/TimestampPlugin.h b/Plugins/TimestampPlugin.h index ba0510c3e..d778bb71d 100644 --- a/Plugins/TimestampPlugin.h +++ b/Plugins/TimestampPlugin.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef TIMESTAMPPLUGIN_H_ #define TIMESTAMPPLUGIN_H_ diff --git a/Plugins/ViaRoutePlugin.h b/Plugins/ViaRoutePlugin.h index 7efb06a10..a4e74184c 100644 --- a/Plugins/ViaRoutePlugin.h +++ b/Plugins/ViaRoutePlugin.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef VIAROUTEPLUGIN_H_ #define VIAROUTEPLUGIN_H_ diff --git a/RoutingAlgorithms/AlternativePathRouting.h b/RoutingAlgorithms/AlternativePathRouting.h index 8b54a3de5..d0fdf3056 100644 --- a/RoutingAlgorithms/AlternativePathRouting.h +++ b/RoutingAlgorithms/AlternativePathRouting.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef ALTERNATIVEROUTES_H_ #define ALTERNATIVEROUTES_H_ diff --git a/RoutingAlgorithms/BasicRoutingInterface.h b/RoutingAlgorithms/BasicRoutingInterface.h index 3c0955aea..79ff992e4 100644 --- a/RoutingAlgorithms/BasicRoutingInterface.h +++ b/RoutingAlgorithms/BasicRoutingInterface.h @@ -1,24 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ #ifndef BASICROUTINGINTERFACE_H_ #define BASICROUTINGINTERFACE_H_ diff --git a/RoutingAlgorithms/ShortestPathRouting.h b/RoutingAlgorithms/ShortestPathRouting.h index f2a3d559d..9914268c2 100644 --- a/RoutingAlgorithms/ShortestPathRouting.h +++ b/RoutingAlgorithms/ShortestPathRouting.h @@ -1,24 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ #ifndef SHORTESTPATHROUTING_H_ #define SHORTESTPATHROUTING_H_ diff --git a/Server/APIGrammar.h b/Server/APIGrammar.h index 3b8794185..bca0b9e30 100644 --- a/Server/APIGrammar.h +++ b/Server/APIGrammar.h @@ -1,24 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ #ifndef APIGRAMMAR_H_ #define APIGRAMMAR_H_ diff --git a/Server/BasicDatastructures.h b/Server/BasicDatastructures.h index 6d6d17485..90dad8c3f 100644 --- a/Server/BasicDatastructures.h +++ b/Server/BasicDatastructures.h @@ -1,21 +1,28 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. */ #ifndef BASIC_DATASTRUCTURES_H diff --git a/Server/Connection.h b/Server/Connection.h index 1f1019d9a..d5a3cfa5c 100644 --- a/Server/Connection.h +++ b/Server/Connection.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef CONNECTION_H #define CONNECTION_H diff --git a/Server/DataStructures/QueryObjectsStorage.cpp b/Server/DataStructures/QueryObjectsStorage.cpp index 84eee3f81..2d6d34304 100644 --- a/Server/DataStructures/QueryObjectsStorage.cpp +++ b/Server/DataStructures/QueryObjectsStorage.cpp @@ -1,23 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "QueryObjectsStorage.h" diff --git a/Server/DataStructures/QueryObjectsStorage.h b/Server/DataStructures/QueryObjectsStorage.h index c81b62d74..74045504f 100644 --- a/Server/DataStructures/QueryObjectsStorage.h +++ b/Server/DataStructures/QueryObjectsStorage.h @@ -1,23 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef QUERYOBJECTSSTORAGE_H_ #define QUERYOBJECTSSTORAGE_H_ diff --git a/Server/DataStructures/RouteParameters.h b/Server/DataStructures/RouteParameters.h index f46a20a10..ce0653e5a 100644 --- a/Server/DataStructures/RouteParameters.h +++ b/Server/DataStructures/RouteParameters.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef ROUTE_PARAMETERS_H #define ROUTE_PARAMETERS_H diff --git a/Server/RequestHandler.h b/Server/RequestHandler.h index 76953403e..3f82988d9 100644 --- a/Server/RequestHandler.h +++ b/Server/RequestHandler.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef REQUEST_HANDLER_H #define REQUEST_HANDLER_H diff --git a/Server/RequestParser.h b/Server/RequestParser.h index 54829de0a..dbc1c0c15 100644 --- a/Server/RequestParser.h +++ b/Server/RequestParser.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef REQUEST_PARSER_H #define REQUEST_PARSER_H diff --git a/Server/Server.h b/Server/Server.h index f3638cb38..96e07749b 100644 --- a/Server/Server.h +++ b/Server/Server.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef SERVER_H #define SERVER_H diff --git a/Server/ServerFactory.h b/Server/ServerFactory.h index 209fe4391..b463e5f37 100644 --- a/Server/ServerFactory.h +++ b/Server/ServerFactory.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef SERVERFACTORY_H_ #define SERVERFACTORY_H_ diff --git a/Tools/componentAnalysis.cpp b/Tools/componentAnalysis.cpp index a3154a184..14a23956f 100644 --- a/Tools/componentAnalysis.cpp +++ b/Tools/componentAnalysis.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "../typedefs.h" #include "../Algorithms/StronglyConnectedComponents.h" diff --git a/Tools/io-benchmark.cpp b/Tools/io-benchmark.cpp index 403e1d9f3..a3def7216 100644 --- a/Tools/io-benchmark.cpp +++ b/Tools/io-benchmark.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "../Util/OSRMException.h" #include "../Util/SimpleLogger.h" diff --git a/Tools/simpleclient.cpp b/Tools/simpleclient.cpp index 7bb53837d..5261c60c7 100644 --- a/Tools/simpleclient.cpp +++ b/Tools/simpleclient.cpp @@ -1,23 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "../Library/OSRM.h" #include "../Util/SimpleLogger.h" diff --git a/Util/Azimuth.h b/Util/Azimuth.h index 166f55fdf..7f54d9cea 100644 --- a/Util/Azimuth.h +++ b/Util/Azimuth.h @@ -1,24 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ #ifndef AZIMUTH_H_ #define AZIMUTH_H_ diff --git a/Util/ContainerUtils.h b/Util/ContainerUtils.h index 215e9885c..40771069b 100644 --- a/Util/ContainerUtils.h +++ b/Util/ContainerUtils.h @@ -1,9 +1,29 @@ /* - * ContainerUtils.h - * - * Created on: 02.02.2013 - * Author: dennis - */ + +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef CONTAINERUTILS_H_ #define CONTAINERUTILS_H_ diff --git a/Util/GitDescription.cpp.in b/Util/GitDescription.cpp.in index c89beb093..6f4ba7ed3 100644 --- a/Util/GitDescription.cpp.in +++ b/Util/GitDescription.cpp.in @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. */ #define GIT_DESCRIPTION "${GIT_DESCRIPTION}" -char g_GIT_DESCRIPTION[] = GIT_DESCRIPTION; \ No newline at end of file +char g_GIT_DESCRIPTION[] = GIT_DESCRIPTION; diff --git a/Util/GitDescription.h b/Util/GitDescription.h index 4df06f338..92a6af337 100644 --- a/Util/GitDescription.h +++ b/Util/GitDescription.h @@ -1,21 +1,28 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. */ -extern char g_GIT_DESCRIPTION[]; \ No newline at end of file +extern char g_GIT_DESCRIPTION[]; diff --git a/Util/GraphLoader.h b/Util/GraphLoader.h index 4c9621302..44e3ae18d 100644 --- a/Util/GraphLoader.h +++ b/Util/GraphLoader.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef GRAPHLOADER_H #define GRAPHLOADER_H diff --git a/Util/IniFile.h b/Util/IniFile.h index 582cc273c..9ede7dfeb 100644 --- a/Util/IniFile.h +++ b/Util/IniFile.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef INI_FILE_H_ #define INI_FILE_H_ diff --git a/Util/InputFileUtil.h b/Util/InputFileUtil.h index 31a98947b..dee7cf55f 100644 --- a/Util/InputFileUtil.h +++ b/Util/InputFileUtil.h @@ -1,26 +1,34 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef INPUTFILEUTIL_H_ #define INPUTFILEUTIL_H_ +#include "SimpleLogger.h" #include "../typedefs.h" #include diff --git a/Util/LinuxStackTrace.h b/Util/LinuxStackTrace.h index 593c07d41..f04290794 100644 --- a/Util/LinuxStackTrace.h +++ b/Util/LinuxStackTrace.h @@ -1,24 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ #ifndef LINUXSTACKTRACE_H_ #define LINUXSTACKTRACE_H_ diff --git a/Util/LuaUtil.h b/Util/LuaUtil.h index 3793d8bda..d7891db55 100644 --- a/Util/LuaUtil.h +++ b/Util/LuaUtil.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef LUAUTIL_H_ #define LUAUTIL_H_ diff --git a/Util/MachineInfo.h b/Util/MachineInfo.h index bdb085aa5..3fcb55e94 100644 --- a/Util/MachineInfo.h +++ b/Util/MachineInfo.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU AFFERO General Public License as published by - the Free Software Foundation; either version 3 of the License, or - any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - You should have received a copy of the GNU Affero General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef MACHINE_INFO_H #define MACHINE_INFO_H diff --git a/Util/OSRMException.h b/Util/OSRMException.h index 804255a3c..322124435 100644 --- a/Util/OSRMException.h +++ b/Util/OSRMException.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef OSRM_EXCEPTION_H #define OSRM_EXCEPTION_H diff --git a/Util/OpenMPWrapper.h b/Util/OpenMPWrapper.h index 7d0cab806..b22cf51fb 100644 --- a/Util/OpenMPWrapper.h +++ b/Util/OpenMPWrapper.h @@ -1,26 +1,32 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _OPENMWRAPPER_H -#define _OPENMWRAPPER_H +#ifndef OPENMP_WRAPPER_H +#define OPENMP_WRAPPER_H #ifdef _OPENMP extern "C" { @@ -32,4 +38,4 @@ or see http://www.gnu.org/licenses/agpl.txt. inline int omp_get_thread_num () { return 0; } inline void omp_set_num_threads (int i) {} #endif /* _OPENMP */ -#endif /* _OPENMWRAPPER_H */ +#endif /* OPEN_MP_WRAPPER_H */ diff --git a/Util/ProgramOptions.h b/Util/ProgramOptions.h index 6872f53c8..a4cb63ebb 100644 --- a/Util/ProgramOptions.h +++ b/Util/ProgramOptions.h @@ -1,24 +1,28 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Custom validators for use with boost::program_options. */ #ifndef PROGAM_OPTIONS_H diff --git a/Util/SimpleLogger.h b/Util/SimpleLogger.h index 6de7ebddf..5ee24aa5c 100644 --- a/Util/SimpleLogger.h +++ b/Util/SimpleLogger.h @@ -1,23 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef SIMPLE_LOGGER_H_ #define SIMPLE_LOGGER_H_ diff --git a/Util/StringUtil.h b/Util/StringUtil.h index 29b125578..f8472bf5d 100644 --- a/Util/StringUtil.h +++ b/Util/StringUtil.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef STRINGUTIL_H_ #define STRINGUTIL_H_ diff --git a/Util/TimingUtil.h b/Util/TimingUtil.h index 2762a3491..290d37799 100644 --- a/Util/TimingUtil.h +++ b/Util/TimingUtil.h @@ -1,21 +1,28 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. */ #ifndef TIMINGUTIL_H_ diff --git a/Util/UUID.cpp.in b/Util/UUID.cpp.in index cd3bc38b1..7030fa6f6 100644 --- a/Util/UUID.cpp.in +++ b/Util/UUID.cpp.in @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "UUID.h" diff --git a/Util/UUID.h b/Util/UUID.h index d609d4592..fe981efdb 100644 --- a/Util/UUID.h +++ b/Util/UUID.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef UUID_H #define UUID_H diff --git a/cmake/size.cpp b/cmake/size.cpp index 2ac045227..5cd002333 100644 --- a/cmake/size.cpp +++ b/cmake/size.cpp @@ -1,3 +1,29 @@ +/* + +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include int main( int argc, char* argv[] ) { @@ -6,4 +32,4 @@ int main( int argc, char* argv[] ) { return 0; } return 1; -} \ No newline at end of file +} diff --git a/createHierarchy.cpp b/createHierarchy.cpp index 4db469b6e..76d550081 100644 --- a/createHierarchy.cpp +++ b/createHierarchy.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "Algorithms/IteratorBasedCRC32.h" #include "Contractor/Contractor.h" diff --git a/extractor.cpp b/extractor.cpp index 9fa3462e6..64c68db32 100644 --- a/extractor.cpp +++ b/extractor.cpp @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "Extractor/ExtractorCallbacks.h" #include "Extractor/ExtractionContainers.h" diff --git a/routed.cpp b/routed.cpp index c4e71a8ce..cda365ed3 100644 --- a/routed.cpp +++ b/routed.cpp @@ -1,23 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #include "Library/OSRM.h" diff --git a/typedefs.h b/typedefs.h index 2592f422b..cfccf98fa 100644 --- a/typedefs.h +++ b/typedefs.h @@ -1,22 +1,29 @@ /* - open source routing machine - Copyright (C) Dennis Luxen, 2010 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ #ifndef TYPEDEFS_H_ #define TYPEDEFS_H_ From 77aa965533eccd378176830994fb462a3926a12a Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 14 Oct 2013 13:47:06 +0200 Subject: [PATCH 36/36] ../AUTHORS.TXT --- AUTHORS.TXT | 11 ----------- README.TXT | 7 ------- 2 files changed, 18 deletions(-) delete mode 100644 AUTHORS.TXT delete mode 100644 README.TXT diff --git a/AUTHORS.TXT b/AUTHORS.TXT deleted file mode 100644 index 8268ebd7f..000000000 --- a/AUTHORS.TXT +++ /dev/null @@ -1,11 +0,0 @@ -The following people contributed code to the Open Source Routing Machine: - -Christian Vetter -Dennis Luxen -Ruslan Krenzler -Frederik Ramm -Bharath Vissapragada -Pascal Neis -Sasa Ivetic -Emil Tin -Henning Moll diff --git a/README.TXT b/README.TXT deleted file mode 100644 index 74a8ea81f..000000000 --- a/README.TXT +++ /dev/null @@ -1,7 +0,0 @@ -For instructions on how to compile and run OSRM, please consult the Wiki at - -https://github.com/DennisOSRM/Project-OSRM/wiki - -or use our free and daily updated online service at - -http://map.project-osrm.org \ No newline at end of file