From 21bee7e40c7f1bbcd6e8d2a6de7e45c32e4a7698 Mon Sep 17 00:00:00 2001
From: Dennis Luxen <luxen@kit.edu>
Date: Wed, 18 Sep 2013 18:33:10 +0200
Subject: [PATCH] Further includes in Facades

---
 Server/DataStructures/BaseDataFacade.h     | 21 ---------------------
 Server/DataStructures/InternalDataFacade.h |  4 ++++
 Server/DataStructures/SharedDataFacade.h   |  4 ++++
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/Server/DataStructures/BaseDataFacade.h b/Server/DataStructures/BaseDataFacade.h
index fc9fd0c0e..8564a7f2b 100644
--- a/Server/DataStructures/BaseDataFacade.h
+++ b/Server/DataStructures/BaseDataFacade.h
@@ -68,16 +68,10 @@ public:
         bool & result
     ) const = 0;
 
-<<<<<<< HEAD
->>>>>>> added graph data access
-
-    virtual unsigned GetNumberOfEdges() const = 0;
-=======
     //node and edge information access
     virtual FixedPointCoordinate GetCoordinateOfNode(
         const unsigned id
     ) const = 0;
->>>>>>> plugging in base facade ptr
 
     virtual unsigned GetOutDegree( const NodeID n ) const = 0;
 
@@ -85,38 +79,23 @@ public:
 
     virtual EdgeDataT &GetEdgeData( const EdgeID e ) = 0;
 
-<<<<<<< HEAD
-    virtual const EdgeDataT &GetEdgeData( const EdgeID e ) const = 0;
-
-    virtual EdgeID BeginEdges( const NodeID n ) const = 0;
-=======
     virtual bool LocateClosestEndPointForCoordinate(
         const FixedPointCoordinate& input_coordinate,
         FixedPointCoordinate& result,
         const unsigned zoom_level = 18
     ) const  = 0;
->>>>>>> added graph data access
 
     virtual EdgeID EndEdges( const NodeID n ) const = 0;
 
     //searches for a specific edge
     virtual EdgeID FindEdge( const NodeID from, const NodeID to ) const = 0;
 
-    virtual EdgeID FindEdgeInEitherDirection(
-        const NodeID from,
-        const NodeID to
-    ) const = 0;
-<<<<<<< HEAD
 
     virtual EdgeID FindEdgeIndicateIfReverse(
         const NodeID from,
         const NodeID to,
         bool & result
     ) const = 0;
-=======
-};
->>>>>>> plugging in base facade ptr
-
 };
 
 #endif // QUERY_DATA_FACADE_H
diff --git a/Server/DataStructures/InternalDataFacade.h b/Server/DataStructures/InternalDataFacade.h
index 80c4d6ffb..fd006bc5b 100644
--- a/Server/DataStructures/InternalDataFacade.h
+++ b/Server/DataStructures/InternalDataFacade.h
@@ -21,8 +21,12 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef INTERNAL_DATA_FACADE
 #define INTERNAL_DATA_FACADE
 
+//implements all data storage when shared memory is _NOT_ used
+
 #include "BaseDataFacade.h"
 
+#include "../../DataStructures/StaticGraph.h"
+
 template<class EdgeDataT>
 class InternalDataFacade : public BaseDataFacade<EdgeDataT> {
 
diff --git a/Server/DataStructures/SharedDataFacade.h b/Server/DataStructures/SharedDataFacade.h
index 4f3bc8880..4a23919b6 100644
--- a/Server/DataStructures/SharedDataFacade.h
+++ b/Server/DataStructures/SharedDataFacade.h
@@ -21,8 +21,12 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef INTERNAL_DATA_FACADE
 #define INTERNAL_DATA_FACADE
 
+//implements all data storage when shared memory is _NOT_ used
+
 #include "BaseDataFacade.h"
 
+#include "../../DataStructures/StaticGraph.h"
+
 template<class EdgeDataT>
 class SharedDataFacade : public BaseDataFacade<EdgeDataT> {