Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] [Issue 338] Inconsistent id types #342

Merged
merged 8 commits into from
Sep 25, 2023
Merged

[Fix] [Issue 338] Inconsistent id types #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ca6ce2
Add id_t and fix warnings
nrkramer Sep 4, 2023
3986e83
Fix Subset_struct
nrkramer Sep 4, 2023
8a889c6
Fix UnionFindTest error
nrkramer Sep 5, 2023
8b24484
More fixes to UnionFindTest
nrkramer Sep 5, 2023
5f4b1b6
Use CXXGraph::id_t in more places
nrkramer Sep 5, 2023
952f971
Address a few PR comments
nrkramer Sep 23, 2023
2e616b0
Ensure CXXGRAPH_ID_TYPE is always unsigned
nrkramer Sep 23, 2023
0abdf9d
Do not return a reference to temporary id
nrkramer Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions include/Edge/DirectedEdge.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ std::ostream &operator<<(std::ostream &o, const DirectedEdge<T> &edge);
template <typename T>
class DirectedEdge : public Edge<T> {
public:
DirectedEdge(const unsigned long id, const Node<T> &node1,
DirectedEdge(const CXXGraph::id_t id, const Node<T> &node1,
const Node<T> &node2);
DirectedEdge(const unsigned long id, shared<const Node<T>> node1,
DirectedEdge(const CXXGraph::id_t id, shared<const Node<T>> node1,
shared<const Node<T>> node2);
DirectedEdge(const unsigned long id,
DirectedEdge(const CXXGraph::id_t id,
const std::pair<const Node<T> *, const Node<T> *> &nodepair);
DirectedEdge(const unsigned long id,
DirectedEdge(const CXXGraph::id_t id,
const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair);
DirectedEdge(const Edge<T> &edge);
virtual ~DirectedEdge() = default;
Expand All @@ -69,23 +69,23 @@ class DirectedEdge : public Edge<T> {
};

template <typename T>
DirectedEdge<T>::DirectedEdge(const unsigned long id, const Node<T> &node1,
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 unsigned long id, shared<const Node<T>> node1,
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(
const unsigned long id,
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(
const unsigned long id,
const CXXGraph::id_t id,
const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair)
: Edge<T>(id, nodepair) {}

Expand Down
16 changes: 8 additions & 8 deletions include/Edge/DirectedWeightedEdge.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ std::ostream &operator<<(std::ostream &o, const DirectedWeightedEdge<T> &edge);
template <typename T>
class DirectedWeightedEdge : public DirectedEdge<T>, public Weighted {
public:
DirectedWeightedEdge(const unsigned long id, const Node<T> &node1,
DirectedWeightedEdge(const CXXGraph::id_t id, const Node<T> &node1,
const Node<T> &node2, const double weight);
DirectedWeightedEdge(const unsigned long id, shared<const Node<T>> node1,
DirectedWeightedEdge(const CXXGraph::id_t id, shared<const Node<T>> node1,
shared<const Node<T>> node2, const double weight);
DirectedWeightedEdge(
const unsigned long id,
const CXXGraph::id_t id,
const std::pair<const Node<T> *, const Node<T> *> &nodepair,
const double weight);
DirectedWeightedEdge(
const unsigned long id,
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);
Expand All @@ -78,29 +78,29 @@ class DirectedWeightedEdge : public DirectedEdge<T>, public Weighted {
};

template <typename T>
DirectedWeightedEdge<T>::DirectedWeightedEdge(const unsigned long id,
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 unsigned long id,
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(
const unsigned long id,
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(
const unsigned long id,
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) {}
Expand Down
23 changes: 12 additions & 11 deletions include/Edge/Edge.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <utility>

#include "Node/Node.hpp"
#include "Utility/id_t.hpp"

namespace CXXGraph {
// Smart pointers alias
Expand All @@ -46,20 +47,20 @@ std::ostream &operator<<(std::ostream &o, const Edge<T> &edge);
template <typename T>
class Edge {
private:
unsigned long long id = 0;
CXXGraph::id_t id = 0;
std::pair<shared<const Node<T>>, shared<const Node<T>>> nodePair;

public:
Edge(const unsigned long long id, const Node<T> &node1, const Node<T> &node2);
Edge(const unsigned long long id, shared<const Node<T>> node1, shared<const Node<T>> node2);
Edge(const unsigned long long id,
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, shared<const Node<T>> node2);
Edge(const CXXGraph::id_t id,
const std::pair<const Node<T> *, const Node<T> *> &nodepair);
Edge(const unsigned long long id,
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);
const unsigned long long &getId() const;
const 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;
Expand All @@ -75,30 +76,30 @@ class Edge {
};

template <typename T>
Edge<T>::Edge(const unsigned long long id, const Node<T> &node1,
Edge<T>::Edge(const CXXGraph::id_t id, const Node<T> &node1,
const Node<T> &node2) {
this->nodePair.first = make_shared<const Node<T>>(node1);
this->nodePair.second = make_shared<const Node<T>>(node2);
this->id = id;
}

template <typename T>
Edge<T>::Edge(const unsigned long long id, shared<const Node<T>> node1, shared<const Node<T>> node2) {
Edge<T>::Edge(const CXXGraph::id_t id, shared<const Node<T>> node1, shared<const Node<T>> node2) {
this->nodePair.first = node1;
this->nodePair.second = node2;
this->id = id;
}

template <typename T>
Edge<T>::Edge(const unsigned long long id,
Edge<T>::Edge(const CXXGraph::id_t id,
const std::pair<const Node<T> *, const Node<T> *> &nodepair) {
this->nodePair.first = make_shared<const Node<T>>(*(nodepair.first));
this->nodePair.second = make_shared<const Node<T>>(*(nodepair.second));
this->id = id;
}

template <typename T>
Edge<T>::Edge(const unsigned long long id,
Edge<T>::Edge(const CXXGraph::id_t id,
const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair)
: nodePair(nodepair) {
this->id = id;
Expand All @@ -117,7 +118,7 @@ void Edge<T>::setSecondNode(shared<const Node<T>> node) {
}

template <typename T>
const unsigned long long &Edge<T>::getId() const {
const unsigned long long Edge<T>::getId() const {
return id;
}

Expand Down
16 changes: 8 additions & 8 deletions include/Edge/UndirectedEdge.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ std::ostream &operator<<(std::ostream &o, const UndirectedEdge<T> &edge);
template <typename T>
class UndirectedEdge : public Edge<T> {
public:
UndirectedEdge(const unsigned long id, const Node<T> &node1,
UndirectedEdge(const CXXGraph::id_t id, const Node<T> &node1,
const Node<T> &node2);
UndirectedEdge(const unsigned long id, shared<const Node<T>> node1,
UndirectedEdge(const CXXGraph::id_t id, shared<const Node<T>> node1,
shared<const Node<T>> node2);
UndirectedEdge(const unsigned long id,
UndirectedEdge(const CXXGraph::id_t id,
const std::pair<const Node<T> *, const Node<T> *> &nodepair);
UndirectedEdge(const unsigned long id,
UndirectedEdge(const CXXGraph::id_t id,
const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair);
UndirectedEdge(const Edge<T> &edge);
virtual ~UndirectedEdge() = default;
Expand All @@ -68,24 +68,24 @@ class UndirectedEdge : public Edge<T> {
};

template <typename T>
UndirectedEdge<T>::UndirectedEdge(const unsigned long id, const Node<T> &node1,
UndirectedEdge<T>::UndirectedEdge(const CXXGraph::id_t id, const Node<T> &node1,
const Node<T> &node2)
: Edge<T>(id, node1, node2) {}

template <typename T>
UndirectedEdge<T>::UndirectedEdge(const unsigned long id, shared<const Node<T>> node1,
UndirectedEdge<T>::UndirectedEdge(const CXXGraph::id_t id, shared<const Node<T>> node1,
shared<const Node<T>> node2)
: Edge<T>(id, node1, node2) {}

template <typename T>
UndirectedEdge<T>::UndirectedEdge(
const unsigned long id,
const CXXGraph::id_t id,
const std::pair<const Node<T> *, const Node<T> *> &nodepair)
: Edge<T>(id, nodepair) {}

template <typename T>
UndirectedEdge<T>::UndirectedEdge(
const unsigned long id,
const CXXGraph::id_t id,
const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair)
: Edge<T>(id, nodepair) {}

Expand Down
16 changes: 8 additions & 8 deletions include/Edge/UndirectedWeightedEdge.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ std::ostream &operator<<(std::ostream &o,
template <typename T>
class UndirectedWeightedEdge : public UndirectedEdge<T>, public Weighted {
public:
UndirectedWeightedEdge(const unsigned long id, const Node<T> &node1,
UndirectedWeightedEdge(const CXXGraph::id_t id, const Node<T> &node1,
const Node<T> &node2, const double weight);
UndirectedWeightedEdge(const unsigned long id, shared<const Node<T>> node1,
UndirectedWeightedEdge(const CXXGraph::id_t id, shared<const Node<T>> node1,
shared<const Node<T>> node2, const double weight);
UndirectedWeightedEdge(
const unsigned long id,
const CXXGraph::id_t id,
const std::pair<const Node<T> *, const Node<T> *> &nodepair,
const double weight);
UndirectedWeightedEdge(
const unsigned long id,
const CXXGraph::id_t id,
const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair,
const double weight);
UndirectedWeightedEdge(const UndirectedEdge<T> &edge, const double weight);
Expand All @@ -80,29 +80,29 @@ class UndirectedWeightedEdge : public UndirectedEdge<T>, public Weighted {
};

template <typename T>
UndirectedWeightedEdge<T>::UndirectedWeightedEdge(const unsigned long id,
UndirectedWeightedEdge<T>::UndirectedWeightedEdge(const CXXGraph::id_t id,
const Node<T> &node1,
const Node<T> &node2,
const double weight)
: UndirectedEdge<T>(id, node1, node2), Weighted(weight) {}

template <typename T>
UndirectedWeightedEdge<T>::UndirectedWeightedEdge(const unsigned long id,
UndirectedWeightedEdge<T>::UndirectedWeightedEdge(const CXXGraph::id_t id,
shared<const Node<T>> node1,
shared<const Node<T>> node2,
const double weight)
: UndirectedEdge<T>(id, node1, node2), Weighted(weight) {}

template <typename T>
UndirectedWeightedEdge<T>::UndirectedWeightedEdge(
const unsigned long id,
const CXXGraph::id_t id,
const std::pair<const Node<T> *, const Node<T> *> &nodepair,
const double weight)
: UndirectedEdge<T>(id, nodepair), Weighted(weight) {}

template <typename T>
UndirectedWeightedEdge<T>::UndirectedWeightedEdge(
const unsigned long id,
const CXXGraph::id_t id,
const std::pair<shared<const Node<T>>, shared<const Node<T>>> &nodepair,
const double weight)
: UndirectedEdge<T>(id, nodepair), Weighted(weight) {}
Expand Down
Loading
Loading