From 3bfb274d24d3cb8e38f0a37c7d47d1c0a46b582e Mon Sep 17 00:00:00 2001
From: Dennis Luxen <luxen@kit.edu>
Date: Wed, 18 May 2011 11:38:09 +0000
Subject: [PATCH] **BREAKING CHANGE ** Removing unnecessary information at edge
 objects. saves roughly 10% of space. **BREAKING CHANGE ** Please redo all
 preprocessing.

---
 Contractor/ContractionCleanup.h |  6 +-----
 Contractor/Contractor.h         |  2 --
 Util/GraphLoader.h              |  5 -----
 createHierarchy.cpp             | 12 ------------
 4 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/Contractor/ContractionCleanup.h b/Contractor/ContractionCleanup.h
index cac6bb2d5..d594ce9d1 100644
--- a/Contractor/ContractionCleanup.h
+++ b/Contractor/ContractionCleanup.h
@@ -75,9 +75,7 @@ public:
             bool shortcut : 1;
             bool forward : 1;
             bool backward : 1;
-            short type:6;
-            bool forwardTurn:1;
-            bool backwardTurn:1;
+            short type;
             _MiddleName middleName;
         } data;
 
@@ -125,8 +123,6 @@ public:
             newEdge.data.forward = _graph[edge].data.forward;
             newEdge.data.backward = _graph[edge].data.backward;
             newEdge.data.type = _graph[edge].data.type;
-            newEdge.data.forwardTurn = _graph[edge].data.forwardTurn;
-            newEdge.data.backwardTurn = _graph[edge].data.backwardTurn;
             edges.push_back( newEdge );
         }
 #ifdef _GLIBCXX_PARALLEL
diff --git a/Contractor/Contractor.h b/Contractor/Contractor.h
index c4409790c..82d019c24 100644
--- a/Contractor/Contractor.h
+++ b/Contractor/Contractor.h
@@ -370,8 +370,6 @@ public:
                 }
 
                 newEdge.data.forward = data.forward;
-                newEdge.data.forwardTurn = data.forwardTurn;
-                newEdge.data.backwardTurn = data.backwardTurn;
                 newEdge.data.backward = data.backward;
                 edges.push_back( newEdge );
             }
diff --git a/Util/GraphLoader.h b/Util/GraphLoader.h
index 45c52f7da..31a3bccdf 100644
--- a/Util/GraphLoader.h
+++ b/Util/GraphLoader.h
@@ -355,8 +355,6 @@ unsigned readHSGRFromStream(istream &in, vector<EdgeT> * edgeList) {
         bool shortcut;
         bool forward;
         bool backward;
-        bool forwardTurn;
-        bool backwardTurn;
         short type;
         NodeID middle;
         NodeID source;
@@ -364,8 +362,6 @@ unsigned readHSGRFromStream(istream &in, vector<EdgeT> * edgeList) {
 
         in.read((char *)&(distance), sizeof(int));
         assert(distance > 0);
-        in.read((char *)&(forwardTurn), sizeof(bool));
-        in.read((char *)&(backwardTurn), sizeof(bool));
         in.read((char *)&(shortcut), sizeof(bool));
         in.read((char *)&(forward), sizeof(bool));
         in.read((char *)&(backward), sizeof(bool));
@@ -374,7 +370,6 @@ unsigned readHSGRFromStream(istream &in, vector<EdgeT> * edgeList) {
         in.read((char *)&(source), sizeof(NodeID));
         in.read((char *)&(target), sizeof(NodeID));
         e.backward = backward; e.distance = distance; e.forward = forward; e.middleName.middle = middle; e.shortcut = shortcut; e.type = type;
-        e.forwardTurn = forwardTurn; e.backwardTurn = backwardTurn;
         g.data = e; g.source = source; g.target = target;
 
         if(source > numberOfNodes)
diff --git a/createHierarchy.cpp b/createHierarchy.cpp
index 31b60aea4..f9acb3082 100644
--- a/createHierarchy.cpp
+++ b/createHierarchy.cpp
@@ -46,7 +46,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "DataStructures/BinaryHeap.h"
 #include "DataStructures/LevelInformation.h"
 #include "DataStructures/NNGrid.h"
-#include "DataStructures/TurnInfoFactory.h"
 #include "Util/BaseConfiguration.h"
 #include "Util/InputFileUtil.h"
 #include "Util/GraphLoader.h"
@@ -90,12 +89,6 @@ int main (int argc, char *argv[]) {
     const NodeID n = readBinaryOSRMGraphFromStream(in, edgeList, int2ExtNodeMap);
     in.close();
 
-    //    cout << "computing turn vector info ..." << flush;
-    //    TurnInfoFactory * infoFactory = new TurnInfoFactory(n, edgeList);
-    //    infoFactory->Run();
-    //    delete infoFactory;
-    //    cout << "ok" << endl;
-
     char nodeOut[1024];
     char edgeOut[1024];
     char ramIndexOut[1024];
@@ -172,12 +165,7 @@ int main (int argc, char *argv[]) {
         NodeID target = it->target;
         short type = it->data.type;
 
-        bool forwardTurn = it->data.forwardTurn;
-        bool backwardTurn = it->data.backwardTurn;
-
         edgeOutFile.write((char *)&(distance), sizeof(int));
-        edgeOutFile.write((char *)&(forwardTurn), sizeof(bool));
-        edgeOutFile.write((char *)&(backwardTurn), sizeof(bool));
         edgeOutFile.write((char *)&(shortcut), sizeof(bool));
         edgeOutFile.write((char *)&(forward), sizeof(bool));
         edgeOutFile.write((char *)&(backward), sizeof(bool));