Updates for performance and ease of moving to constexpr later, C++26 …

…or using a constexpr set lib
ZigRazor · Jan 6, 2025 · c0cf7ad · c0cf7ad
1 parent f2543eb
commit c0cf7ad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 21 deletions.
diff --git a/include/CXXGraph/Edge/DirectedEdge.h b/include/CXXGraph/Edge/DirectedEdge.h
@@ -17,11 +17,11 @@
 /***	 License: MPL v2.0 ***/
 /***********************************************************/
 
-#ifndef __CXXGRAPH_DIRECTEDEDGE_H__
-#define __CXXGRAPH_DIRECTEDEDGE_H__
+#ifndef CXXGRAPH_DIRECTEDEDGE_H
+#define CXXGRAPH_DIRECTEDEDGE_H
 
 #pragma once
 
 #include "DirectedEdge_impl.hpp"
 
-#endif  // __CXXGRAPH_DIRECTEDEDGE_H__
+#endif  // CXXGRAPH_DIRECTEDEDGE_H
diff --git a/include/CXXGraph/Graph/Graph_impl.hpp b/include/CXXGraph/Graph/Graph_impl.hpp
@@ -31,28 +31,21 @@
 namespace CXXGraph {
 
 using std::make_shared;
-using std::make_unique;
 
 template <typename T>
-Graph<T>::Graph() {
-  /* Caching the adjacency matrix */
-  cacheAdjMatrix();
-  cacheDegreeMatrix();
-  cacheLaplacianMatrix();
-  cacheTransitionMatrix();
-}
+Graph<T>::Graph()
+    : cachedAdjMatrix(Graph<T>::getAdjMatrix()),
+      cachedDegreeMatrix(Graph<T>::getDegreeMatrix()),
+      cachedLaplacianMatrix(Graph<T>::getLaplacianMatrix()),
+      cachedTransitionMatrix(Graph<T>::getTransitionMatrix()) {}
 
 template <typename T>
-Graph<T>::Graph(const T_EdgeSet<T> &edgeSet) {
-  for (auto edgeIt : edgeSet) {
-    this->edgeSet.insert(edgeIt);
-  }
-  /* Caching the adjacency matrix */
-  cacheAdjMatrix();
-  cacheDegreeMatrix();
-  cacheLaplacianMatrix();
-  cacheTransitionMatrix();
-}
+Graph<T>::Graph(const T_EdgeSet<T> &edgeSetToCopy)
+    : edgeSet(edgeSetToCopy),
+      cachedAdjMatrix(Graph<T>::getAdjMatrix()),
+      cachedDegreeMatrix(Graph<T>::getDegreeMatrix()),
+      cachedLaplacianMatrix(Graph<T>::getLaplacianMatrix()),
+      cachedTransitionMatrix(Graph<T>::getTransitionMatrix()) {}
 
 template <typename T>
 const T_EdgeSet<T> &Graph<T>::getEdgeSet() const {