Merge branch 'master' into kruskal

Author: ZigRazor

CONTRIBUTING.md

@@ -5,20 +5,20 @@ Thank you for taking the time to contribute to the project. The following set of
 
 ## Reporting Bugs / Proposing New Features
 
-If you discover a bug or want to propose a new feature or enhancement to the code or documentation, please check whether the problem has already been reported in the [Issues](https://github.com/ZigRazor/AHGPBM/issues).
+If you discover a bug or want to propose a new feature or enhancement to the code or documentation, please check whether the problem has already been reported in the [Issues](https://github.com/ZigRazor/CXXGraph/issues).
 
 If not, open a new issue and state the problem. Please provide a clear summary of the problem, what behavior you have expected and what behavior you have actually observed. If possible, create a *Minimal Reproducable Example* that demonstrates the problem.
 
 
 ## Submitting Changes
 
-We also highly welcome code contributions via pull requests. Note that your changes - after acceptance - will be offered under the **Apache 2.0** license. For more information, see the [LICENSE](https://github.com/ZigRazor/AHGPBM/blob/main/LICENSE).
+We also highly welcome code contributions via pull requests. Note that your changes - after acceptance - will be offered under the **Apache 2.0** license. For more information, see the [LICENSE](https://github.com/ZigRazor/CXXGraph/blob/master/LICENSE).
 
 To create and submit your changes, follow the standard *Fork & Pull Request Workflow*:
 
 1. Fork the project and switch to a new suitably named branch.
 2. Create one or more commits that reflect the changes you have made. Each commit should be self-contained, atomic and buildable. Therefore, split multiple features into different commits and include fixups in the related commit instead of creating a new one. If you add new functionality, please also add related tests.
-3. Test the changes on your local machine. For this, the provided scripts will help you to build the code and run the unit tests. See the [README](https://github.com/ZigRazor/AHGPBM/blob/main/README.md) for details.
+3. Test the changes on your local machine. For this, the provided scripts will help you to build the code and run the unit tests. See the [README](https://github.com/ZigRazor/CXXGraph/blob/master/README.md) for details.
 4. Push the branch to your fork.
 5. Open a new pull request and summarize the problem and your solution. If there is a related issue, please mention it too.
 

include/Edge/DirectedEdge.hpp

@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __DIRECTEDEDGE_H__
-#define __DIRECTEDEDGE_H__
+#ifndef __CXXGRAPH_DIRECTEDEDGE_H__
+#define __CXXGRAPH_DIRECTEDEDGE_H__
 
 #pragma once
 
@@ -101,4 +101,4 @@ namespace CXXGRAPH
 	}
 }
 
-#endif // __DIRECTEDEDGE_H__
+#endif // __CXXGRAPH_DIRECTEDEDGE_H__

include/Edge/DirectedWeightedEdge.hpp

@@ -16,8 +16,8 @@
 /***********************************************************/
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
-#ifndef __DIRECTEDWEIGHTEDEDGE_H__
-#define __DIRECTEDWEIGHTEDEDGE_H__
+#ifndef __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__
+#define __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__
 
 #pragma once
 
@@ -106,4 +106,4 @@ namespace CXXGRAPH
 
 }
 
-#endif // __DIRECTEDWEIGHTEDEDGE_H__
+#endif // __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__

include/Edge/Edge.hpp

@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __EDGE_H__
-#define __EDGE_H__
+#ifndef __CXXGRAPH_EDGE_H__
+#define __CXXGRAPH_EDGE_H__
 
 #pragma once
 
@@ -114,4 +114,4 @@ namespace CXXGRAPH
 	}
 }
 
-#endif // __EDGE_H__
+#endif // __CXXGRAPH_EDGE_H__

include/Edge/UndirectedEdge.hpp

@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __UNDIRECTEDEDGE_H__
-#define __UNDIRECTEDEDGE_H__
+#ifndef __CXXGRAPH_UNDIRECTEDEDGE_H__
+#define __CXXGRAPH_UNDIRECTEDEDGE_H__
 
 #pragma once
 
@@ -100,4 +100,4 @@ namespace CXXGRAPH
 }
 
 
-#endif // __UNDIRECTEDEDGE_H__
+#endif // __CXXGRAPH_UNDIRECTEDEDGE_H__

include/Edge/UndirectedWeightedEdge.hpp

@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __UNDIRECTEDWEIGHTEDEDGE_H__
-#define __UNDIRECTEDWEIGHTEDEDGE_H__
+#ifndef __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__
+#define __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__
 
 #pragma once
 
@@ -107,4 +107,4 @@ namespace CXXGRAPH
 
 }
 
-#endif // __UNDIRECTEDWEIGHTEDEDGE_H__
+#endif // __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__

include/Edge/Weighted.hpp

@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __WEIGHTED_H__
-#define __WEIGHTED_H__
+#ifndef __CXXGRAPH_WEIGHTED_H__
+#define __CXXGRAPH_WEIGHTED_H__
 
 #pragma once
 
@@ -64,4 +64,4 @@ namespace CXXGRAPH
 }
 
 
-#endif // __WEIGHTED_H__
+#endif // __CXXGRAPH_WEIGHTED_H__

include/Graph/Graph.hpp

@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __GRAPH_H__
-#define __GRAPH_H__
+#ifndef __CXXGRAPH_GRAPH_H__
+#define __CXXGRAPH_GRAPH_H__
 
 #pragma once
 
@@ -931,12 +931,12 @@ namespace CXXGRAPH
 		{
 			(*subsets)[nodeId].parent = Graph<T>::setFind(subsets, (*subsets)[nodeId].parent);
 		}
-
+		
 		return (*subsets)[nodeId].parent;
 	}
 
 	template <typename T>
-	void Graph<T>::setUnion(std::vector<Subset> *subsets, const unsigned long elem1, const unsigned long elem2) const
+	void Graph<T>::setUnion(std::vector<Subset>* subsets, const unsigned long elem1, const unsigned long elem2) const
 	{
 		// return;
 		// if both sets have same parent
@@ -954,7 +954,7 @@ namespace CXXGRAPH
 			(*subsets)[elem2].parent = elem1Parent;
 			(*subsets)[elem1Parent].rank++;
 		}
-	}
+  }
 
 	template <typename T>
 	const AdjacencyMatrix<T> Graph<T>::getAdjMatrix() const
@@ -2251,4 +2251,4 @@ namespace CXXGRAPH
 	}
 
 } // namespace CXXGRAPH
-#endif // __GRAPH_H__
+#endif // __CXXGRAPH_GRAPH_H__

include/Graph/Graph_TS.hpp

@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __GRAPH_TS_H__
-#define __GRAPH_TS_H__
+#ifndef __CXXGRAPH_GRAPH_TS_H__
+#define __CXXGRAPH_GRAPH_TS_H__
 
 #pragma once
 
@@ -429,4 +429,4 @@ namespace CXXGRAPH
         return partitions;
     }
 }
-#endif // __GRAPH_TS_H__
+#endif // __CXXGRAPH_GRAPH_TS_H__

include/Node/Node.hpp

@@ -18,8 +18,8 @@
 /***********************************************************/
 
 
-#ifndef __NODE_H__
-#define __NODE_H__
+#ifndef __CXXGRAPH_NODE_H__
+#define __CXXGRAPH_NODE_H__
 
 #pragma once
 #include <iostream>
@@ -90,4 +90,4 @@ namespace CXXGRAPH
 	}
 }
 
-#endif // __NODE_H__
+#endif // __CXXGRAPH_NODE_H__