Run clang-format

This commit is contained in:
Patrick Niklaus
2016-01-08 01:31:57 +01:00
parent 6b18e4f7e9
commit 6991a38703
149 changed files with 457 additions and 498 deletions
@@ -219,7 +219,6 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
std::string descriptor_string;
DataFacadeT *facade;
};
}
}
}
-1
View File
@@ -80,7 +80,6 @@ class HelloWorldPlugin final : public BasePlugin
private:
std::string descriptor_string;
};
}
}
}
+6 -6
View File
@@ -37,7 +37,9 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
using SubMatching = routing_algorithms::SubMatching;
using SubMatchingList = routing_algorithms::SubMatchingList;
using CandidateLists = routing_algorithms::CandidateLists;
using ClassifierT = map_matching::BayesClassifier<map_matching::LaplaceDistribution, map_matching::LaplaceDistribution, double>;
using ClassifierT = map_matching::BayesClassifier<map_matching::LaplaceDistribution,
map_matching::LaplaceDistribution,
double>;
using TraceClassification = ClassifierT::ClassificationT;
public:
@@ -203,13 +205,13 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
if (route_parameters.geometry || route_parameters.print_instructions)
{
using SegmentList = guidance::SegmentList<DataFacadeT>;
//Passing false to extract_alternative extracts the route.
// Passing false to extract_alternative extracts the route.
const constexpr bool EXTRACT_ROUTE = false;
// by passing false to segment_list, we skip the douglas peucker simplification
// and mark all segments as necessary within the generation process
const constexpr bool NO_ROUTE_SIMPLIFICATION = false;
SegmentList segment_list(raw_route, EXTRACT_ROUTE, route_parameters.zoom_level,
NO_ROUTE_SIMPLIFICATION, facade);
NO_ROUTE_SIMPLIFICATION, facade);
if (route_parameters.geometry)
{
@@ -220,8 +222,7 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
if (route_parameters.print_instructions)
{
subtrace.values["instructions"] =
guidance::AnnotateRoute<DataFacadeT>(
segment_list.Get(), facade);
guidance::AnnotateRoute<DataFacadeT>(segment_list.Get(), facade);
}
util::json::Object json_route_summary;
@@ -379,7 +380,6 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
int max_locations_map_matching;
ClassifierT classifier;
};
}
}
}
+1 -3
View File
@@ -30,8 +30,7 @@ template <class DataFacadeT> class NearestPlugin final : public BasePlugin
util::json::Object &json_result) override final
{
// check number of parameters
if (route_parameters.coordinates.empty() ||
!route_parameters.coordinates.front().IsValid())
if (route_parameters.coordinates.empty() || !route_parameters.coordinates.front().IsValid())
{
return Status::Error;
}
@@ -101,7 +100,6 @@ template <class DataFacadeT> class NearestPlugin final : public BasePlugin
DataFacadeT *facade;
std::string descriptor_string;
};
}
}
}
-1
View File
@@ -112,7 +112,6 @@ class BasePlugin
return snapped_phantoms;
}
};
}
}
}
-1
View File
@@ -36,7 +36,6 @@ template <class DataFacadeT> class TimestampPlugin final : public BasePlugin
const DataFacadeT *facade;
std::string descriptor_string;
};
}
}
}
+5 -7
View File
@@ -149,8 +149,8 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
}
// Run TarjanSCC
auto wrapper = std::make_shared<util::MatrixGraphWrapper<EdgeWeight>>(result_table.GetTable(),
number_of_locations);
auto wrapper = std::make_shared<util::MatrixGraphWrapper<EdgeWeight>>(
result_table.GetTable(), number_of_locations);
auto scc = extractor::TarjanSCC<util::MatrixGraphWrapper<EdgeWeight>>(wrapper);
scc.run();
@@ -301,13 +301,12 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
if (component_size < BF_MAX_FEASABLE)
{
scc_route =
trip::BruteForceTrip(start, end, number_of_locations, result_table);
scc_route = trip::BruteForceTrip(start, end, number_of_locations, result_table);
}
else
{
scc_route = trip::FarthestInsertionTrip(start, end, number_of_locations,
result_table);
scc_route =
trip::FarthestInsertionTrip(start, end, number_of_locations, result_table);
}
// use this output if debugging of route is needed:
@@ -366,7 +365,6 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
return Status::Ok;
}
};
}
}
}
-1
View File
@@ -166,7 +166,6 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
return Status::Ok;
}
};
}
}
}