Constexpr additions

.github/workflows/cmake.yml

@@ -2,9 +2,7 @@ name: CMake
 
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -41,7 +39,7 @@ jobs:
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       run: |
         if [ ${{ matrix.os }} == 'windows-latest' ]; then
-          cmake -DTEST=ON -Dgtest_disable_pthreads=ON -B ${{github.workspace}}/build
+          cmake -DTEST=ON -Dgtest_disable_pthreads=ON -B ./build
         else
           cmake -DTEST=ON -B ${{github.workspace}}/build
         fi;

.gitignore

@@ -39,3 +39,5 @@ packaging/
 .vscode
 .code-workspace
 CXXGraph.code-workspace
+# ignore Visual Studio files
+/.vs

include/CXXGraph/CXXGraphConfig.h

@@ -1,4 +1,4 @@
-// the configured options and settings for CXXGraph
-#define CXXGraph_VERSION_MAJOR 4
-#define CXXGraph_VERSION_MINOR 1
-#define CXXGraph_VERSION_PATCH 0
+// the configured options and settings for CXXGraph
+#define CXXGraph_VERSION_MAJOR 4
+#define CXXGraph_VERSION_MINOR 1
+#define CXXGraph_VERSION_PATCH 0

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

include/CXXGraph/Edge/DirectedEdge_decl.h

@@ -17,8 +17,8 @@
 /***	 License: MPL v2.0 ***/
 /***********************************************************/
 
-#ifndef __CXXGRAPH_DIRECTEDEDGE_DECL_H__
-#define __CXXGRAPH_DIRECTEDEDGE_DECL_H__
+#ifndef CXXGRAPH_DIRECTEDEDGE_DECL_H_
+#define CXXGRAPH_DIRECTEDEDGE_DECL_H_
 
 #pragma once
 
@@ -42,19 +42,21 @@ std::ostream &operator<<(std::ostream &o, const DirectedEdge<T> &edge);
 template <typename T>
 class DirectedEdge : public Edge<T> {
  public:
-  DirectedEdge(const CXXGraph::id_t id, const Node<T> &node1,
+  constexpr DirectedEdge(const CXXGraph::id_t id, const Node<T> &node1,
                const Node<T> &node2);
-  DirectedEdge(const CXXGraph::id_t id, shared<const Node<T>> node1,
+  constexpr DirectedEdge(const CXXGraph::id_t id, shared<const Node<T>> node1,
                shared<const Node<T>> node2);
-  DirectedEdge(const CXXGraph::id_t id,
+  constexpr DirectedEdge(
+      const CXXGraph::id_t id,
                const std::pair<const Node<T> *, const Node<T> *> &nodepair);
-  DirectedEdge(
+  constexpr DirectedEdge(
       const CXXGraph::id_t id,
       const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair);
-  DirectedEdge(const Edge<T> &edge);
+  constexpr DirectedEdge(const Edge<T> &edge);
   virtual ~DirectedEdge() = default;
-  const Node<T> &getFrom() const;
-  const Node<T> &getTo() const;
+  constexpr const Node<T> &getFrom() const;
+  constexpr const Node<T> &getTo() const;
+  // 
   const std::optional<bool> isDirected() const override;
   const std::optional<bool> isWeighted() const override;
   // operator
@@ -67,4 +69,4 @@ class DirectedEdge : public Edge<T> {
 };
 }  // namespace CXXGraph
 
-#endif  // __CXXGRAPH_DIRECTEDEDGE_H__
+#endif  // CXXGRAPH_DIRECTEDEDGE_H_

include/CXXGraph/Edge/DirectedEdge_impl.hpp

@@ -26,44 +26,42 @@
 
 namespace CXXGraph {
 
-using std::make_shared;
-using std::make_unique;
-
 template <typename T>
-DirectedEdge<T>::DirectedEdge(const CXXGraph::id_t id, const Node<T> &node1,
+constexpr DirectedEdge<T>::DirectedEdge(const CXXGraph::id_t id,
+                                       const Node<T> &node1,
                               const Node<T> &node2)
     : Edge<T>(id, node1, node2) {}
 
 template <typename T>
-DirectedEdge<T>::DirectedEdge(const CXXGraph::id_t id,
+constexpr DirectedEdge<T>::DirectedEdge(const CXXGraph::id_t id,
                               shared<const Node<T>> node1,
                               shared<const Node<T>> node2)
     : Edge<T>(id, node1, node2) {}
 
 template <typename T>
-DirectedEdge<T>::DirectedEdge(
+constexpr DirectedEdge<T>::DirectedEdge(
     const CXXGraph::id_t id,
     const std::pair<const Node<T> *, const Node<T> *> &nodepair)
     : Edge<T>(id, nodepair) {}
 
 template <typename T>
-DirectedEdge<T>::DirectedEdge(
+constexpr DirectedEdge<T>::DirectedEdge(
     const CXXGraph::id_t id,
     const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair)
     : Edge<T>(id, nodepair) {}
 
 template <typename T>
-DirectedEdge<T>::DirectedEdge(const Edge<T> &edge)
+constexpr DirectedEdge<T>::DirectedEdge(const Edge<T> &edge)
     : DirectedEdge(edge.getId(), *(edge.getNodePair().first),
                    *(edge.getNodePair().second)) {}
 
 template <typename T>
-const Node<T> &DirectedEdge<T>::getFrom() const {
+constexpr const Node<T> &DirectedEdge<T>::getFrom() const {
   return *(Edge<T>::getNodePair().first);
 }
 
 template <typename T>
-const Node<T> &DirectedEdge<T>::getTo() const {
+constexpr const Node<T> &DirectedEdge<T>::getTo() const {
   return *(Edge<T>::getNodePair().second);
 }
 

include/CXXGraph/Edge/DirectedWeightedEdge.h

@@ -16,11 +16,11 @@
 /***********************************************************/
 /***	 License: MPL v2.0 ***/
 /***********************************************************/
-#ifndef __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__
-#define __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__
+#ifndef CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H_
+#define CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H_
 
 #pragma once
 
 #include "DirectedWeightedEdge_impl.hpp"
 
-#endif  // __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__
+#endif  // CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H_

include/CXXGraph/Edge/DirectedWeightedEdge_decl.h

@@ -16,8 +16,8 @@
 /***********************************************************/
 /***	 License: MPL v2.0 ***/
 /***********************************************************/
-#ifndef __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H__
-#define __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H__
+#ifndef CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H_
+#define CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H_
 
 #pragma once
 
@@ -31,7 +31,7 @@ using unique = std::unique_ptr<T>;
 template <typename T>
 using shared = std::shared_ptr<T>;
 
-// Foward Declaration
+// Forward Declaration
 template <typename T>
 class UndirectedWeightedEdge;
 
@@ -45,23 +45,25 @@ std::ostream &operator<<(std::ostream &o, const DirectedWeightedEdge<T> &edge);
 template <typename T>
 class DirectedWeightedEdge : public DirectedEdge<T>, public Weighted {
  public:
-  DirectedWeightedEdge(const CXXGraph::id_t id, const Node<T> &node1,
+  constexpr DirectedWeightedEdge(const CXXGraph::id_t id, const Node<T> &node1,
                        const Node<T> &node2, const double weight);
-  DirectedWeightedEdge(const CXXGraph::id_t id, shared<const Node<T>> node1,
+  constexpr DirectedWeightedEdge(const CXXGraph::id_t id,
+                                 shared<const Node<T>> node1,
                        shared<const Node<T>> node2, const double weight);
-  DirectedWeightedEdge(
+  constexpr DirectedWeightedEdge(
       const CXXGraph::id_t id,
       const std::pair<const Node<T> *, const Node<T> *> &nodepair,
       const double weight);
-  DirectedWeightedEdge(
+  constexpr DirectedWeightedEdge(
       const CXXGraph::id_t id,
       const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair,
       const double weight);
-  DirectedWeightedEdge(const DirectedEdge<T> &edge, const double weight);
-  DirectedWeightedEdge(const Edge<T> &edge, const double weight);
-  DirectedWeightedEdge(const DirectedEdge<T> &edge);
-  DirectedWeightedEdge(const Edge<T> &edge);
-  DirectedWeightedEdge(const UndirectedWeightedEdge<T> &edge);
+  constexpr DirectedWeightedEdge(const DirectedEdge<T> &edge,
+                                 const double weight);
+  constexpr DirectedWeightedEdge(const Edge<T> &edge, const double weight);
+  constexpr DirectedWeightedEdge(const DirectedEdge<T> &edge);
+  constexpr DirectedWeightedEdge(const Edge<T> &edge);
+  constexpr DirectedWeightedEdge(const UndirectedWeightedEdge<T> &edge);
   virtual ~DirectedWeightedEdge() = default;
   const std::optional<bool> isWeighted() const override;
   // operator
@@ -76,4 +78,4 @@ class DirectedWeightedEdge : public DirectedEdge<T>, public Weighted {
 
 }  // namespace CXXGraph
 
-#endif  // __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H__
+#endif  // CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H_

include/CXXGraph/Edge/DirectedWeightedEdge_impl.hpp

@@ -26,57 +26,57 @@
 
 namespace CXXGraph {
 
-using std::make_shared;
-using std::make_unique;
-
 template <typename T>
-DirectedWeightedEdge<T>::DirectedWeightedEdge(const CXXGraph::id_t id,
+constexpr DirectedWeightedEdge<T>::DirectedWeightedEdge(const CXXGraph::id_t id,
                                               const Node<T> &node1,
                                               const Node<T> &node2,
                                               const double weight)
     : DirectedEdge<T>(id, node1, node2), Weighted(weight) {}
 
 template <typename T>
-DirectedWeightedEdge<T>::DirectedWeightedEdge(const CXXGraph::id_t id,
+constexpr DirectedWeightedEdge<T>::DirectedWeightedEdge(
+    const CXXGraph::id_t id,
                                               shared<const Node<T>> node1,
                                               shared<const Node<T>> node2,
                                               const double weight)
     : DirectedEdge<T>(id, node1, node2), Weighted(weight) {}
 
 template <typename T>
-DirectedWeightedEdge<T>::DirectedWeightedEdge(
+constexpr DirectedWeightedEdge<T>::DirectedWeightedEdge(
     const CXXGraph::id_t id,
     const std::pair<const Node<T> *, const Node<T> *> &nodepair,
     const double weight)
     : DirectedEdge<T>(id, nodepair), Weighted(weight) {}
 
 template <typename T>
-DirectedWeightedEdge<T>::DirectedWeightedEdge(
+constexpr DirectedWeightedEdge<T>::DirectedWeightedEdge(
     const CXXGraph::id_t id,
     const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair,
     const double weight)
     : DirectedEdge<T>(id, nodepair), Weighted(weight) {}
 
 template <typename T>
-DirectedWeightedEdge<T>::DirectedWeightedEdge(const DirectedEdge<T> &edge,
+constexpr DirectedWeightedEdge<T>::DirectedWeightedEdge(
+    const DirectedEdge<T> &edge,
                                               const double weight)
     : DirectedEdge<T>(edge), Weighted(weight) {}
 
 template <typename T>
-DirectedWeightedEdge<T>::DirectedWeightedEdge(const Edge<T> &edge,
+constexpr DirectedWeightedEdge<T>::DirectedWeightedEdge(const Edge<T> &edge,
                                               const double weight)
     : DirectedEdge<T>(edge), Weighted(weight) {}
 
 template <typename T>
-DirectedWeightedEdge<T>::DirectedWeightedEdge(const DirectedEdge<T> &edge)
+constexpr DirectedWeightedEdge<T>::DirectedWeightedEdge(
+    const DirectedEdge<T> &edge)
     : DirectedEdge<T>(edge), Weighted() {}
 
 template <typename T>
-DirectedWeightedEdge<T>::DirectedWeightedEdge(const Edge<T> &edge)
+constexpr DirectedWeightedEdge<T>::DirectedWeightedEdge(const Edge<T> &edge)
     : DirectedEdge<T>(edge), Weighted() {}
 
 template <typename T>
-DirectedWeightedEdge<T>::DirectedWeightedEdge(
+constexpr DirectedWeightedEdge<T>::DirectedWeightedEdge(
     const UndirectedWeightedEdge<T> &edge)
     : DirectedEdge<T>(edge), Weighted(edge.getWeight()) {}
 

include/CXXGraph/Edge/Edge.h

@@ -17,11 +17,11 @@
 /***	 License: MPL v2.0 ***/
 /***********************************************************/
 
-#ifndef __CXXGRAPH_EDGE_H__
-#define __CXXGRAPH_EDGE_H__
+#ifndef CXXGRAPH_EDGE_H_
+#define CXXGRAPH_EDGE_H_
 
 #pragma once
 
 #include "CXXGraph/Edge/Edge_impl.hpp"
 
-#endif  // __CXXGRAPH_EDGE_H__
+#endif  // CXXGRAPH_EDGE_H_

include/CXXGraph/Edge/Edge_decl.h

@@ -17,8 +17,8 @@
 /***	 License: MPL v2.0 ***/
 /***********************************************************/
 
-#ifndef __CXXGRAPH_EDGE_DECL_H__
-#define __CXXGRAPH_EDGE_DECL_H__
+#ifndef CXXGRAPH_EDGE_DECL_H_
+#define CXXGRAPH_EDGE_DECL_H_
 
 #pragma once
 
@@ -49,29 +49,30 @@ class Edge {
  public:
   typedef T Node_t;
 
-  Edge(const CXXGraph::id_t id, const Node<T> &node1, const Node<T> &node2);
-  Edge(const CXXGraph::id_t id, shared<const Node<T>> node1,
+  constexpr Edge(const CXXGraph::id_t id, const Node<T> &node1, const Node<T> &node2);
+  constexpr Edge(const CXXGraph::id_t id, shared<const Node<T>> node1,
        shared<const Node<T>> node2);
-  Edge(const CXXGraph::id_t id,
+  constexpr Edge(const CXXGraph::id_t id,
        const std::pair<const Node<T> *, const Node<T> *> &nodepair);
-  Edge(const CXXGraph::id_t id,
+  constexpr Edge(
+      const CXXGraph::id_t id,
        const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair);
   virtual ~Edge() = default;
   void setFirstNode(shared<const Node<T>> node);
   void setSecondNode(shared<const Node<T>> node);
-  unsigned long long getId() const;
+  constexpr unsigned long long getId() const;
   const std::pair<shared<const Node<T>>, shared<const Node<T>>> &getNodePair()
       const;
   shared<const Node<T>> getOtherNode(shared<const Node<T>> node) const;
   virtual const std::optional<bool> isDirected() const;
   virtual const std::optional<bool> isWeighted() const;
   // operator
   virtual bool operator==(const Edge<T> &b) const;
-  bool operator<(const Edge<T> &b) const;
+  constexpr bool operator<(const Edge<T> &b) const;
 
   friend std::ostream &operator<< <>(std::ostream &os, const Edge<T> &edge);
 };
 
 }  // namespace CXXGraph
 
-#endif  // __CXXGRAPH_EDGE_DECL_H__
+#endif  // CXXGRAPH_EDGE_DECL_H_