fixed make install, close #335 (#354)

* moved files inside include folder into include/ * fixed relative header link in include/CXXGraph folder * fixed relative header link in examples folder * fixed relative header link in test folder * fixed relative header link in benchmark folder * fixed relative path to CXXGraphConfig.h file in CMakeLists
ZigRazor · Sep 28, 2023 · 31ac919 · 31ac919
1 parent 6a13044
commit 31ac919
Show file tree

Hide file tree

Showing 94 changed files with 141 additions and 158 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.9)
 # set the project name and version
 project(CXXGraph VERSION 2.0.0)
 
-configure_file(CXXGraphConfig.h.in ${PROJECT_SOURCE_DIR}/include/CXXGraphConfig.h)
+configure_file(CXXGraphConfig.h.in ${PROJECT_SOURCE_DIR}/include/CXXGraph/CXXGraphConfig.h)
 
 # specify the C++ standard
 set(CMAKE_CXX_STANDARD 17)
@@ -41,3 +41,4 @@ add_subdirectory(benchmark)
 add_subdirectory(examples)
 
 #install(FILES include/Graph.hpp DESTINATION /usr/include)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include)
diff --git a/benchmark/BFS_BM.cpp b/benchmark/BFS_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void BFS_X(benchmark::State &state) {

diff --git a/benchmark/BellmanFord_BM.cpp b/benchmark/BellmanFord_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void BellmanFord_X(benchmark::State &state) {

diff --git a/benchmark/Boruvka_BM.cpp b/benchmark/Boruvka_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void Boruvka_X(benchmark::State &state) {

diff --git a/benchmark/Connectivity_BM.cpp b/benchmark/Connectivity_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void Connectivity_X(benchmark::State &state) {

diff --git a/benchmark/CycleCheck_BM.cpp b/benchmark/CycleCheck_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void CycleCheckBFS_X(benchmark::State &state) {

diff --git a/benchmark/DFS_BM.cpp b/benchmark/DFS_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void DFS_X(benchmark::State &state) {

diff --git a/benchmark/Dial_BM.cpp b/benchmark/Dial_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void Dial_X(benchmark::State &state) {

diff --git a/benchmark/Dijkstra_BM.cpp b/benchmark/Dijkstra_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void Dijkstra_X(benchmark::State &state) {

diff --git a/benchmark/Edge_BM.cpp b/benchmark/Edge_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void BM_EdgeCreation(benchmark::State &state) {

diff --git a/benchmark/EulerPath_BM.cpp b/benchmark/EulerPath_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void EulerPath_X(benchmark::State &state) {

diff --git a/benchmark/FloydWarshall_BM.cpp b/benchmark/FloydWarshall_BM.cpp
@@ -1,8 +1,7 @@
 #include <benchmark/benchmark.h>
-#include <Edge/DirectedWeightedEdge.hpp>
 #include <memory>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 using std::make_shared;

diff --git a/benchmark/FordFulkerson_BM.cpp b/benchmark/FordFulkerson_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void FordFulkerson_X(benchmark::State &state) {

diff --git a/benchmark/GraphSlicing_BM.cpp b/benchmark/GraphSlicing_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void GraphSlicing_X(benchmark::State &state) {

diff --git a/benchmark/Graph_BM.cpp b/benchmark/Graph_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 // static CXXGraph::Graph<int> *graph;

diff --git a/benchmark/Kruskal_BM.cpp b/benchmark/Kruskal_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void Kruskal_X(benchmark::State &state) {

diff --git a/benchmark/Node_BM.cpp b/benchmark/Node_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void NodeCreation(benchmark::State &state) {

diff --git a/benchmark/Partition_BM.cpp b/benchmark/Partition_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void PartitionHDRF_X(benchmark::State &state) {

diff --git a/benchmark/Prim_BM.cpp b/benchmark/Prim_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void Prim_X(benchmark::State &state) {

diff --git a/benchmark/TopologicalSort_BM.cpp b/benchmark/TopologicalSort_BM.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
 static void TopologicalSort_X(benchmark::State &state) {

diff --git a/benchmark/Utilities.hpp b/benchmark/Utilities.hpp
@@ -4,7 +4,7 @@
 
 #include <random>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 
 static std::map<unsigned long, CXXGraph::Node<int> *> generateRandomNodes(
     unsigned long numberOfNodes, int MaxValue) {

diff --git a/examples/DialExample/dial_example.cpp b/examples/DialExample/dial_example.cpp
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <memory>
 
-#include <CXXGraph.hpp>
+#include <CXXGraph/CXXGraph.hpp>
 
 using std::make_shared;
 

diff --git a/examples/DijkstraExample/dijkstra_example.cpp b/examples/DijkstraExample/dijkstra_example.cpp
@@ -1,4 +1,4 @@
-#include <CXXGraph.hpp>
+#include <CXXGraph/CXXGraph.hpp>
 
 #include <memory>
 

diff --git a/examples/PartitionExample/partition_example.cpp b/examples/PartitionExample/partition_example.cpp
@@ -3,7 +3,7 @@
 
 #include <iterator>
 
-#include "CXXGraph.hpp"
+#include "CXXGraph/CXXGraph.hpp"
 
 static CXXGraph::Graph<int> *readGraph(const std::string &filename) {
   CXXGraph::Graph<int> *graph_ptr = new CXXGraph::Graph<int>();

diff --git a/include/CXXGraph.hpp b/include/CXXGraph.hpp
diff --git a/include/CXXGraph/CXXGraph.hpp b/include/CXXGraph/CXXGraph.hpp
@@ -0,0 +1,28 @@
+#ifndef __CXXGRAPH_H__
+#define __CXXGRAPH_H__
+
+#include "CXXGraph/CXXGraphConfig.h"
+#include "CXXGraph/Edge/DirectedEdge.hpp"
+#include "CXXGraph/Edge/DirectedWeightedEdge.hpp"
+#include "CXXGraph/Edge/Edge.hpp"
+#include "CXXGraph/Edge/UndirectedEdge.hpp"
+#include "CXXGraph/Edge/UndirectedWeightedEdge.hpp"
+#include "CXXGraph/Edge/Weighted.hpp"
+#include "CXXGraph/Graph/Graph.hpp"
+#include "CXXGraph/Node/Node.hpp"
+#include "CXXGraph/Partitioning/CoordinatedPartitionState.hpp"
+#include "CXXGraph/Partitioning/CoordinatedRecord.hpp"
+#include "CXXGraph/Partitioning/EBV.hpp"
+#include "CXXGraph/Partitioning/EdgeBalancedVertexCut.hpp"
+#include "CXXGraph/Partitioning/GreedyVertexCut.hpp"
+#include "CXXGraph/Partitioning/HDRF.hpp"
+#include "CXXGraph/Partitioning/Partition.hpp"
+#include "CXXGraph/Partitioning/PartitionAlgorithm.hpp"
+#include "CXXGraph/Partitioning/PartitionState.hpp"
+#include "CXXGraph/Partitioning/PartitionStrategy.hpp"
+#include "CXXGraph/Partitioning/Partitioner.hpp"
+#include "CXXGraph/Partitioning/PartitionerThread.hpp"
+#include "CXXGraph/Partitioning/PartitioningStats.hpp"
+#include "CXXGraph/Partitioning/Record.hpp"
+
+#endif  // __CXXGRAPH_H__
diff --git a/include/CXXGraphConfig.h → include/CXXGraph/CXXGraphConfig.h b/include/CXXGraphConfig.h → include/CXXGraph/CXXGraphConfig.h
diff --git a/include/Edge/DirectedEdge.hpp → include/CXXGraph/Edge/DirectedEdge.hpp b/include/Edge/DirectedEdge.hpp → include/CXXGraph/Edge/DirectedEdge.hpp
diff --git a/include/Edge/DirectedWeightedEdge.hpp → ...de/CXXGraph/Edge/DirectedWeightedEdge.hpp b/include/Edge/DirectedWeightedEdge.hpp → ...de/CXXGraph/Edge/DirectedWeightedEdge.hpp
diff --git a/include/Edge/Edge.hpp → include/CXXGraph/Edge/Edge.hpp b/include/Edge/Edge.hpp → include/CXXGraph/Edge/Edge.hpp
@@ -26,8 +26,8 @@
 #include <optional>
 #include <utility>
 
-#include "Node/Node.hpp"
-#include "Utility/id_t.hpp"
+#include "CXXGraph/Node/Node.hpp"
+#include "CXXGraph/Utility/id_t.hpp"
 
 namespace CXXGraph {
 // Smart pointers alias

diff --git a/include/Edge/UndirectedEdge.hpp → include/CXXGraph/Edge/UndirectedEdge.hpp b/include/Edge/UndirectedEdge.hpp → include/CXXGraph/Edge/UndirectedEdge.hpp
diff --git a/include/Edge/UndirectedWeightedEdge.hpp → .../CXXGraph/Edge/UndirectedWeightedEdge.hpp b/include/Edge/UndirectedWeightedEdge.hpp → .../CXXGraph/Edge/UndirectedWeightedEdge.hpp
diff --git a/include/Edge/Weighted.hpp → include/CXXGraph/Edge/Weighted.hpp b/include/Edge/Weighted.hpp → include/CXXGraph/Edge/Weighted.hpp
diff --git a/include/Graph/Graph.hpp → include/CXXGraph/Graph/Graph.hpp b/include/Graph/Graph.hpp → include/CXXGraph/Graph/Graph.hpp
@@ -49,24 +49,24 @@
 #include <unordered_set>
 #include <utility>
 
-#include "Edge/DirectedEdge.hpp"
-#include "Edge/DirectedWeightedEdge.hpp"
-#include "Edge/Edge.hpp"
-#include "Edge/UndirectedEdge.hpp"
-#include "Edge/UndirectedWeightedEdge.hpp"
-#include "Edge/Weighted.hpp"
-#include "Node/Node.hpp"
-#include "Partitioning/Partition.hpp"
-#include "Partitioning/PartitionAlgorithm.hpp"
-#include "Partitioning/Partitioner.hpp"
-#include "Partitioning/Utility/Globals.hpp"
-#include "Utility/ConstString.hpp"
-#include "Utility/ConstValue.hpp"
-#include "Utility/PointerHash.hpp"
-#include "Utility/Reader.hpp"
-#include "Utility/ThreadSafe.hpp"
-#include "Utility/Typedef.hpp"
-#include "Utility/Writer.hpp"
+#include "CXXGraph/Edge/DirectedEdge.hpp"
+#include "CXXGraph/Edge/DirectedWeightedEdge.hpp"
+#include "CXXGraph/Edge/Edge.hpp"
+#include "CXXGraph/Edge/UndirectedEdge.hpp"
+#include "CXXGraph/Edge/UndirectedWeightedEdge.hpp"
+#include "CXXGraph/Edge/Weighted.hpp"
+#include "CXXGraph/Node/Node.hpp"
+#include "CXXGraph/Partitioning/Partition.hpp"
+#include "CXXGraph/Partitioning/PartitionAlgorithm.hpp"
+#include "CXXGraph/Partitioning/Partitioner.hpp"
+#include "CXXGraph/Partitioning/Utility/Globals.hpp"
+#include "CXXGraph/Utility/ConstString.hpp"
+#include "CXXGraph/Utility/ConstValue.hpp"
+#include "CXXGraph/Utility/PointerHash.hpp"
+#include "CXXGraph/Utility/Reader.hpp"
+#include "CXXGraph/Utility/ThreadSafe.hpp"
+#include "CXXGraph/Utility/Typedef.hpp"
+#include "CXXGraph/Utility/Writer.hpp"
 
 #ifdef WITH_COMPRESSION
 #include <zlib.h>

diff --git a/include/Node/Node.hpp → include/CXXGraph/Node/Node.hpp b/include/Node/Node.hpp → include/CXXGraph/Node/Node.hpp
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Utility/id_t.hpp"
+#include "CXXGraph/Utility/id_t.hpp"
 
 #include <iomanip>
 #include <iostream>

diff --git a/...artitioning/CoordinatedPartitionState.hpp → ...artitioning/CoordinatedPartitionState.hpp b/...artitioning/CoordinatedPartitionState.hpp → ...artitioning/CoordinatedPartitionState.hpp
@@ -28,9 +28,9 @@
 #include <vector>
 
 #include "CoordinatedRecord.hpp"
-#include "Edge/Edge.hpp"
+#include "CXXGraph/Edge/Edge.hpp"
 #include "PartitionState.hpp"
-#include "Partitioning/Utility/Globals.hpp"
+#include "CXXGraph/Partitioning/Utility/Globals.hpp"
 #include "Record.hpp"
 
 namespace CXXGraph {

diff --git a/include/Partitioning/CoordinatedRecord.hpp → ...XGraph/Partitioning/CoordinatedRecord.hpp b/include/Partitioning/CoordinatedRecord.hpp → ...XGraph/Partitioning/CoordinatedRecord.hpp
@@ -25,7 +25,7 @@
 #include <set>
 
 #include "Record.hpp"
-#include "Utility/Typedef.hpp"
+#include "CXXGraph/Utility/Typedef.hpp"
 
 namespace CXXGraph {
 namespace Partitioning {
@@ -142,4 +142,4 @@ void CoordinatedRecord<T>::addAll(const std::set<int> &set) {
 }  // namespace Partitioning
 }  // namespace CXXGraph
 
-#endif  // __CXXGRAPH_PARTITIONING_COORDINATEDRECORD_H__
+#endif  // __CXXGRAPH_PARTITIONING_COORDINATEDRECORD_H__
diff --git a/include/Partitioning/EBV.hpp → include/CXXGraph/Partitioning/EBV.hpp b/include/Partitioning/EBV.hpp → include/CXXGraph/Partitioning/EBV.hpp
@@ -26,9 +26,9 @@
 #include <chrono>
 #include <unordered_map>
 
-#include "Edge/Edge.hpp"
+#include "CXXGraph/Edge/Edge.hpp"
 #include "PartitionStrategy.hpp"
-#include "Partitioning/Utility/Globals.hpp"
+#include "CXXGraph/Partitioning/Utility/Globals.hpp"
 
 namespace CXXGraph {
 // Smart pointers alias

diff --git a/...de/Partitioning/EdgeBalancedVertexCut.hpp → ...ph/Partitioning/EdgeBalancedVertexCut.hpp b/...de/Partitioning/EdgeBalancedVertexCut.hpp → ...ph/Partitioning/EdgeBalancedVertexCut.hpp
@@ -25,9 +25,9 @@
 
 #include <chrono>
 
-#include "Edge/Edge.hpp"
+#include "CXXGraph/Edge/Edge.hpp"
 #include "PartitionStrategy.hpp"
-#include "Partitioning/Utility/Globals.hpp"
+#include "CXXGraph/Partitioning/Utility/Globals.hpp"
 
 namespace CXXGraph {
 // Smart pointers alias

diff --git a/include/Partitioning/GreedyVertexCut.hpp → ...CXXGraph/Partitioning/GreedyVertexCut.hpp b/include/Partitioning/GreedyVertexCut.hpp → ...CXXGraph/Partitioning/GreedyVertexCut.hpp
@@ -26,9 +26,9 @@
 #include <chrono>
 #include <random>
 
-#include "Edge/Edge.hpp"
+#include "CXXGraph/Edge/Edge.hpp"
 #include "PartitionStrategy.hpp"
-#include "Partitioning/Utility/Globals.hpp"
+#include "CXXGraph/Partitioning/Utility/Globals.hpp"
 
 namespace CXXGraph {
 // Smart pointers alias

diff --git a/include/Partitioning/HDRF.hpp → include/CXXGraph/Partitioning/HDRF.hpp b/include/Partitioning/HDRF.hpp → include/CXXGraph/Partitioning/HDRF.hpp
@@ -26,9 +26,9 @@
 #include <chrono>
 #include <random>
 
-#include "Edge/Edge.hpp"
+#include "CXXGraph/Edge/Edge.hpp"
 #include "PartitionStrategy.hpp"
-#include "Partitioning/Utility/Globals.hpp"
+#include "CXXGraph/Partitioning/Utility/Globals.hpp"
 
 namespace CXXGraph {
 // Smart pointers alias