From 4f3727030029caaf6d617d073a83eb752d163360 Mon Sep 17 00:00:00 2001
From: Patrick Niklaus <patrick.niklaus@student.kit.edu>
Date: Tue, 13 May 2014 01:00:24 +0200
Subject: [PATCH] Simple fix that improves runtime of edge based egde
 generation by 26%

---
 Contractor/EdgeBasedGraphFactory.cpp | 20 +++++++++-----------
 Contractor/EdgeBasedGraphFactory.h   |  4 ++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp
index 25acf39a7..4f938882f 100644
--- a/Contractor/EdgeBasedGraphFactory.cpp
+++ b/Contractor/EdgeBasedGraphFactory.cpp
@@ -628,8 +628,10 @@ EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(const std::string &original_edg
                 {
                     distance += speed_profile.trafficSignalPenalty;
                 }
-                const int turn_penalty = GetTurnPenalty(u, v, w, lua_state);
-                TurnInstruction turn_instruction = AnalyzeTurn(u, v, w);
+                const double angle = GetAngleBetweenThreeFixedPointCoordinates(
+                m_node_info_list[u], m_node_info_list[v], m_node_info_list[w]);
+                const int turn_penalty = GetTurnPenalty(angle, lua_state);
+                TurnInstruction turn_instruction = AnalyzeTurn(u, v, w, angle);
                 if (turn_instruction == TurnInstruction::UTurn)
                 {
                     distance += speed_profile.uTurnPenalty;
@@ -686,13 +688,8 @@ EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(const std::string &original_edg
     SimpleLogger().Write() << "  skips " << skipped_barrier_turns_counter << " turns over barriers";
 }
 
-int EdgeBasedGraphFactory::GetTurnPenalty(const NodeID u,
-                                          const NodeID v,
-                                          const NodeID w,
-                                          lua_State *lua_state) const
+int EdgeBasedGraphFactory::GetTurnPenalty(double angle, lua_State *lua_state) const
 {
-    const double angle = GetAngleBetweenThreeFixedPointCoordinates(
-        m_node_info_list[u], m_node_info_list[v], m_node_info_list[w]);
 
     if (speed_profile.has_turn_penalty_function)
     {
@@ -706,7 +703,10 @@ int EdgeBasedGraphFactory::GetTurnPenalty(const NodeID u,
     return 0;
 }
 
-TurnInstruction EdgeBasedGraphFactory::AnalyzeTurn(const NodeID u, const NodeID v, const NodeID w)
+TurnInstruction EdgeBasedGraphFactory::AnalyzeTurn(const NodeID u,
+                                                   const NodeID v,
+                                                   const NodeID w,
+                                                   double angle)
     const
 {
     if (u == w)
@@ -771,8 +771,6 @@ TurnInstruction EdgeBasedGraphFactory::AnalyzeTurn(const NodeID u, const NodeID
         }
     }
 
-    const double angle = GetAngleBetweenThreeFixedPointCoordinates(
-        m_node_info_list[u], m_node_info_list[v], m_node_info_list[w]);
     return TurnInstructionsClass::GetTurnDirectionOfInstruction(angle);
 }
 
diff --git a/Contractor/EdgeBasedGraphFactory.h b/Contractor/EdgeBasedGraphFactory.h
index 07b19e754..175e95362 100644
--- a/Contractor/EdgeBasedGraphFactory.h
+++ b/Contractor/EdgeBasedGraphFactory.h
@@ -76,9 +76,9 @@ class EdgeBasedGraphFactory
 
     void GetEdgeBasedNodes(std::vector<EdgeBasedNode> &nodes);
 
-    TurnInstruction AnalyzeTurn(const NodeID u, const NodeID v, const NodeID w) const;
+    TurnInstruction AnalyzeTurn(const NodeID u, const NodeID v, const NodeID w, double angle) const;
 
-    int GetTurnPenalty(const NodeID u, const NodeID v, const NodeID w, lua_State *lua_state) const;
+    int GetTurnPenalty(double angle, lua_State *lua_state) const;
 
     unsigned GetNumberOfEdgeBasedNodes() const;