Skip to content

Commit 02373b3

Browse files
ZigRazorZigRazor
committed
Clang Format
1 parent 3c8e804 commit 02373b3

8 files changed

Lines changed: 30 additions & 36 deletions

File tree

‎benchmark/Utilities.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ static CXXGraph::Graph<int> *readGraph(const std::string &filename) {
8585

8686
static const auto nodes = generateRandomNodes(100000, 2);
8787
static const auto edges = generateRandomEdges(100000, nodes);
88-
static const auto undirectedEdges = generateRandomUndirectedEdges(100000, nodes);
88+
static const auto undirectedEdges =
89+
generateRandomUndirectedEdges(100000, nodes);
8990
static const auto cit_graph_ptr = readGraph("CitHepPh");
9091

9192
#endif // __UTILITIES_H__

‎include/CXXGraph/Graph/Graph_impl.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ template <typename T>
9999
void Graph<T>::addEdge(shared<const Edge<T>> edge) {
100100
auto [it, inserted] = edgeSet.insert(edge);
101101
if (!inserted) {
102-
return;
102+
return;
103103
}
104104

105105
auto &[from, to] = edge->getNodePair();
@@ -388,7 +388,7 @@ std::unordered_set<shared<Node<T>>, nodeHash<T>> Graph<T>::nodeSet() {
388388
}
389389

390390
for (const auto &adjListOutIt : *cachedAdjListOut) {
391-
nodeSet.insert(std::const_pointer_cast<Node<T>> (adjListOutIt.first));
391+
nodeSet.insert(std::const_pointer_cast<Node<T>>(adjListOutIt.first));
392392
}
393393

394394
for (auto &isNodeIt : isolatedNodesSet) {

‎include/CXXGraph/Partitioning/HDRF.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void HDRF<T>::performStep(shared<const Edge<T>> e,
101101
std::this_thread::sleep_for(std::chrono::microseconds(backoff));
102102
if (backoff < GLOBALS.SLEEP_LIMIT) backoff *= 2;
103103
}
104-
104+
105105
//*** LOCK TAKEN
106106
int machine_id = -1;
107107

‎include/CXXGraph/Partitioning/Record.hpp‎

100755100644
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ namespace CXXGraph {
2828
namespace Partitioning {
2929
template <typename T>
3030
class Record {
31-
protected:
31+
protected:
3232
bool owns_lock = false;
33+
3334
public:
3435
virtual ~Record() = default;
3536

‎test/ConnectivityTest.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ TEST(ConnectivityTest, test_5) {
258258
edgeSet.insert(make_shared<CXXGraph::DirectedWeightedEdge<int>>(edge13));
259259
edgeSet.insert(make_shared<CXXGraph::DirectedWeightedEdge<int>>(edge14));
260260

261-
262261
CXXGraph::Graph<int> graph(edgeSet);
263262

264263
ASSERT_FALSE(graph.isConnectedGraph());

‎test/DialTest.cpp‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ using std::make_unique;
1717
* Node1 -> Node2 weight = 1
1818
* Node2 -> Node3 weight = 1
1919
* Node1 <-> Node3 weight = 6
20-
*/
20+
*/
2121
TEST(DialTest, test_1) {
2222
CXXGraph::Node<int> node1("1", 1);
2323
CXXGraph::Node<int> node2("2", 2);
@@ -45,7 +45,7 @@ TEST(DialTest, test_1) {
4545
* Node1 -> Node2 weight = 5
4646
* Node2 -> Node3 weight = 4
4747
* Node1 <-> Node3 weight = 6
48-
*/
48+
*/
4949
TEST(DialTest, test_2) {
5050
CXXGraph::Node<int> node1("1", 1);
5151
CXXGraph::Node<int> node2("2", 2);
@@ -74,7 +74,7 @@ TEST(DialTest, test_2) {
7474
* Node1 -> Node2 weight = 5
7575
* Node2 -> Node3 unweighted
7676
* Node1 <-> Node3 weight = 6
77-
*/
77+
*/
7878
TEST(DialTest, test_3) {
7979
CXXGraph::Node<int> node1("1", 1);
8080
CXXGraph::Node<int> node2("2", 2);
@@ -99,7 +99,7 @@ TEST(DialTest, test_3) {
9999
* 3 Nodes
100100
* Node2 -> Node3 unweighted
101101
* Node1 <-> Node3 weight = 6
102-
*/
102+
*/
103103
TEST(DialTest, test_4) {
104104
CXXGraph::Node<int> node1("1", 1);
105105
CXXGraph::Node<int> node2("2", 2);
@@ -124,7 +124,7 @@ TEST(DialTest, test_4) {
124124
* Node2 -> Node3 unweighted
125125
* Node1 <-> Node3 weight = 6
126126
* Only nodes which are a part of the edgeSet are a part of the graph (nodeSet)
127-
*/
127+
*/
128128
TEST(DialTest, test_5) {
129129
CXXGraph::Node<int> node1("1", 1);
130130
CXXGraph::Node<int> node2("2", 2);
@@ -146,7 +146,7 @@ TEST(DialTest, test_5) {
146146
* 3 Nodes, zero weight edges
147147
* Node1 -> Node2 weight = 0
148148
* Node2 -> Node3 weight = 0
149-
*/
149+
*/
150150
TEST(DialTest, test_6) {
151151
CXXGraph::Node<int> node1("1", 1);
152152
CXXGraph::Node<int> node2("2", 2);
@@ -175,7 +175,7 @@ TEST(DialTest, test_6) {
175175
* 2 Nodes, multi edges, same end points, choose smaller edge
176176
* Node1 -> Node2 weight = 3
177177
* Node1 -> Node2 weight = 5
178-
*/
178+
*/
179179
TEST(DialTest, test_7) {
180180
CXXGraph::Node<int> node1("1", 1);
181181
CXXGraph::Node<int> node2("2", 2);
@@ -185,7 +185,8 @@ TEST(DialTest, test_7) {
185185

186186
CXXGraph::T_EdgeSet<int> edgeSet;
187187
edgeSet.insert(make_shared<CXXGraph::DirectedWeightedEdge<int>>(edge12First));
188-
edgeSet.insert(make_shared<CXXGraph::DirectedWeightedEdge<int>>(edge12Second));
188+
edgeSet.insert(
189+
make_shared<CXXGraph::DirectedWeightedEdge<int>>(edge12Second));
189190

190191
CXXGraph::Graph<int> graph(edgeSet);
191192

@@ -202,7 +203,7 @@ TEST(DialTest, test_7) {
202203
* Node2 -> Node3 weight = 5
203204
* Node3 -> Node1 weight = 8
204205
* Node1 -> Node3 weight = 2
205-
*/
206+
*/
206207
TEST(DialTest, test_8) {
207208
CXXGraph::Node<int> node1("1", 1);
208209
CXXGraph::Node<int> node2("2", 2);
@@ -233,7 +234,7 @@ TEST(DialTest, test_8) {
233234
* 2 Nodes, self loop
234235
* Node1 -> Node1 weight = 3
235236
* Node1 -> Node2 weight = 5
236-
*/
237+
*/
237238
TEST(DialTest, test_9) {
238239
CXXGraph::Node<int> node1("1", 1);
239240
CXXGraph::Node<int> node2("2", 2);
@@ -259,27 +260,24 @@ class BadDirectedWeightedEdge : public CXXGraph::DirectedWeightedEdge<T> {
259260
public:
260261
using Base = CXXGraph::DirectedWeightedEdge<T>;
261262
// forward to existing ctor
262-
BadDirectedWeightedEdge(const CXXGraph::id_t id,
263-
const CXXGraph::Node<T> &n1,
264-
const CXXGraph::Node<T> &n2,
265-
const double weight)
263+
BadDirectedWeightedEdge(const CXXGraph::id_t id, const CXXGraph::Node<T> &n1,
264+
const CXXGraph::Node<T> &n2, const double weight)
266265
: Base(id, n1, n2, weight) {}
267266

268-
const std::optional<bool> isDirected() const override {
269-
return std::nullopt;
270-
}
267+
const std::optional<bool> isDirected() const override { return std::nullopt; }
271268
};
272269

273270
/*
274271
* 2 Nodes, invalid directed weighted edge
275272
* The edge claims it's weighted but does not tell us direction
276273
* Node1 -> Node2 weight = 5
277-
*/
274+
*/
278275
TEST(DialTest, test_10) {
279276
CXXGraph::Node<int> node1("1", 1);
280277
CXXGraph::Node<int> node2("2", 2);
281278

282-
auto badEdge = std::make_shared<BadDirectedWeightedEdge<int>>(1, node1, node2, 5);
279+
auto badEdge =
280+
std::make_shared<BadDirectedWeightedEdge<int>>(1, node1, node2, 5);
283281

284282
CXXGraph::T_EdgeSet<int> edgeSet;
285283
edgeSet.insert(badEdge);

‎test/DijkstraTest.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,8 +1283,3 @@ TEST(DijkstraTest, deterministic2_target_not_connected_test) {
12831283
ASSERT_EQ(res.errorMessage, CXXGraph::ERR_TARGET_NODE_NOT_IN_GRAPH);
12841284
ASSERT_EQ(res.result, CXXGraph::INF_DOUBLE);
12851285
}
1286-
1287-
1288-
1289-
1290-

‎test/GraphTest.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,13 +1459,13 @@ TEST(GraphTest, set_data_isolated) {
14591459
}
14601460

14611461
TEST(GraphTest, type_trait_not_extractable) {
1462-
CXXGraph::Node<int*> node1("1", nullptr);
1463-
CXXGraph::Node<int*> node2("2", nullptr);
1464-
CXXGraph::Edge<int*> edge(1, node1, node2);
1462+
CXXGraph::Node<int *> node1("1", nullptr);
1463+
CXXGraph::Node<int *> node2("2", nullptr);
1464+
CXXGraph::Edge<int *> edge(1, node1, node2);
14651465

1466-
CXXGraph::T_EdgeSet<int*> edgeSet;
1467-
edgeSet.insert(make_shared<CXXGraph::Edge<int*>>(edge));
1466+
CXXGraph::T_EdgeSet<int *> edgeSet;
1467+
edgeSet.insert(make_shared<CXXGraph::Edge<int *>>(edge));
14681468

1469-
CXXGraph::Graph<int*> graph(edgeSet);
1469+
CXXGraph::Graph<int *> graph(edgeSet);
14701470
ASSERT_EQ(graph.getEdgeSet(), edgeSet);
14711471
}

0 commit comments

Comments
 (0)