Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Gorbushin <m.gorbushin@corp.mail.ru>2019-05-22 17:12:37 +0300
committerVladimir Byko-Ianko <bykoianko@gmail.com>2019-05-24 17:29:38 +0300
commit67af21aaa3a5c5d733cbe1d5774071264522cafd (patch)
tree7b7fb2c2d64441b174d6c1729efe64098c9dd1f3 /routing
parent811ea178b0e3d95b5ffd67730e3ce30cc9d3df14 (diff)
[routing] review fixes
Diffstat (limited to 'routing')
-rw-r--r--routing/leaps_postprocessor.hpp1
-rw-r--r--routing/routing_tests/bfs_tests.cpp1
-rw-r--r--routing/routing_tests/routing_algorithm.cpp10
3 files changed, 7 insertions, 5 deletions
diff --git a/routing/leaps_postprocessor.hpp b/routing/leaps_postprocessor.hpp
index cfdea5b95e..3cd57523ef 100644
--- a/routing/leaps_postprocessor.hpp
+++ b/routing/leaps_postprocessor.hpp
@@ -10,6 +10,7 @@
#include <cstdint>
#include <map>
#include <set>
+#include <string>
#include <vector>
namespace routing
diff --git a/routing/routing_tests/bfs_tests.cpp b/routing/routing_tests/bfs_tests.cpp
index 625d3d2eb6..712cf14602 100644
--- a/routing/routing_tests/bfs_tests.cpp
+++ b/routing/routing_tests/bfs_tests.cpp
@@ -6,6 +6,7 @@
#include <cstdint>
#include <set>
+#include <vector>
namespace
{
diff --git a/routing/routing_tests/routing_algorithm.cpp b/routing/routing_tests/routing_algorithm.cpp
index 6127a1dd1e..5e68524f10 100644
--- a/routing/routing_tests/routing_algorithm.cpp
+++ b/routing/routing_tests/routing_algorithm.cpp
@@ -39,7 +39,7 @@ void UndirectedGraph::GetOutgoingEdgesList(Vertex const & v, std::vector<SimpleE
double UndirectedGraph::HeuristicCostEstimate(Vertex const & v, Vertex const & w)
{
- return 0;
+ return 0.0;
}
void UndirectedGraph::GetAdjacencyList(Vertex v, std::vector<Edge> & adj) const
@@ -56,12 +56,12 @@ void DirectedGraph::AddEdge(Vertex from, Vertex to, Weight w)
m_ingoing[to].emplace_back(from, w);
}
-void DirectedGraph::GetIngoingEdgesList(Vertex const & v, vector<Edge> & adj)
+void DirectedGraph::GetIngoingEdgesList(Vertex const & v, std::vector<Edge> & adj)
{
adj = m_ingoing[v];
}
-void DirectedGraph::GetOutgoingEdgesList(Vertex const & v, vector<Edge> & adj)
+void DirectedGraph::GetOutgoingEdgesList(Vertex const & v, std::vector<Edge> & adj)
{
adj = m_outgoing[v];
}
@@ -110,7 +110,7 @@ public:
: m_roadGraph(roadGraph), m_maxSpeedMPS(KMPH2MPS(roadGraph.GetMaxSpeedKMpH()))
{}
- void GetOutgoingEdgesList(Vertex const & v, vector<Edge> & adj) override
+ void GetOutgoingEdgesList(Vertex const & v, std::vector<Edge> & adj) override
{
IRoadGraph::EdgeVector edges;
m_roadGraph.GetOutgoingEdges(v, edges);
@@ -128,7 +128,7 @@ public:
}
}
- void GetIngoingEdgesList(Vertex const & v, vector<Edge> & adj) override
+ void GetIngoingEdgesList(Vertex const & v, std::vector<Edge> & adj) override
{
IRoadGraph::EdgeVector edges;
m_roadGraph.GetIngoingEdges(v, edges);