First step into overhauling the edge storage

This commit is contained in:
Patrick Niklaus
2015-05-09 17:21:36 +02:00
parent c493a22765
commit a57fb4f1ab
16 changed files with 530 additions and 522 deletions
-2
View File
@@ -86,6 +86,4 @@ struct EdgeBasedEdge
bool backward : 1;
};
using ImportEdge = NodeBasedEdge;
#endif /* IMPORT_EDGE_HPP */
+3 -3
View File
@@ -74,16 +74,16 @@ struct NodeBasedEdgeData
using NodeBasedDynamicGraph = DynamicGraph<NodeBasedEdgeData>;
// Factory method to create NodeBasedDynamicGraph from ImportEdges
// Factory method to create NodeBasedDynamicGraph from NodeBasedEdges
inline std::shared_ptr<NodeBasedDynamicGraph>
NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<ImportEdge> &input_edge_list)
NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<NodeBasedEdge> &input_edge_list)
{
static_assert(sizeof(NodeBasedEdgeData) == 16,
"changing node based edge data size changes memory consumption");
DeallocatingVector<NodeBasedDynamicGraph::InputEdge> edges_list;
NodeBasedDynamicGraph::InputEdge edge;
for (const ImportEdge &import_edge : input_edge_list)
for (const NodeBasedEdge &import_edge : input_edge_list)
{
if (import_edge.forward)
{