Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class IncrementalUniformRandomSelector {
/**
* Initialize the random select for one element.
*/
IncrementalUniformRandomSelector() : counter(1){};
IncrementalUniformRandomSelector() : counter(1) {};

/**
* Add the next element.
Expand Down
6 changes: 3 additions & 3 deletions include/networkit/auxiliary/Vector2Arrow.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Author: Ian Chen (ianchen3)
*/

#ifndef NETWORKIT_AUXILIARY_VECTOR2ARROW_HPP_
#define NETWORKIT_AUXILIARY_VECTOR2ARROW_HPP_
#ifndef NETWORKIT_AUXILIARY_VECTOR2_ARROW_HPP_
#define NETWORKIT_AUXILIARY_VECTOR2_ARROW_HPP_

#include <memory>
#include <vector>
Expand Down Expand Up @@ -35,4 +35,4 @@ std::shared_ptr<Arr> vectorToArrow(std::vector<T> vec) {

} // namespace Aux

#endif
#endif // NETWORKIT_AUXILIARY_VECTOR2_ARROW_HPP_
25 changes: 13 additions & 12 deletions include/networkit/community/ParallelLeidenScoringExtension.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@

namespace NetworKit {

using ParallelLeidenCommunityScoreFunction =
double (*)(double cutWeight, double degree, double communityVolume, count subsetSize,
count communitySize, double gamma, double inverseGraphVolume);
using ParallelLeidenCommunityScoreFunction = double (*)(double cutWeight, double degree,
double communityVolume, count subsetSize,
count communitySize, double gamma,
double inverseGraphVolume);

using ParallelLeidenRefineSetConditionFunction =
bool (*)(double cutWeight, double subsetVolume, count subsetSize, double targetVolume,
count targetSize, double sourceVolume, count sourceSize, double gamma,
double inverseGraphVolume);
using ParallelLeidenRefineSetConditionFunction = bool (*)(double cutWeight, double subsetVolume,
count subsetSize, double targetVolume,
count targetSize, double sourceVolume,
count sourceSize, double gamma,
double inverseGraphVolume);

} // namespace NetworKit

Expand All @@ -27,8 +29,8 @@ extern "C" {
/**
* Required: score a candidate community during the move phase.
*/
double networkitParallelLeidenCommunityScore(double cutWeight, double degree, double communityVolume,
NetworKit::count subsetSize,
double networkitParallelLeidenCommunityScore(double cutWeight, double degree,
double communityVolume, NetworKit::count subsetSize,
NetworKit::count communitySize, double gamma,
double inverseGraphVolume);

Expand All @@ -40,8 +42,7 @@ double networkitParallelLeidenCurrentCommunityThreshold(double cutWeight, double
double communityVolume,
NetworKit::count subsetSize,
NetworKit::count communitySize,
double gamma,
double inverseGraphVolume);
double gamma, double inverseGraphVolume);

/**
* Optional: override the refine-phase R-set condition.
Expand All @@ -61,7 +62,7 @@ bool networkitParallelLeidenRefineTSetCondition(double cutWeight, double subsetV
NetworKit::count subsetSize, double targetVolume,
NetworKit::count targetSize, double sourceVolume,
NetworKit::count sourceSize, double gamma,
double inverseGraphVolume);
double inverseGraphVolume);

} // extern "C"

Expand Down
2 changes: 1 addition & 1 deletion include/networkit/community/ParallelLeidenView.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include <limits>
#include <memory>
#include <mutex>
#include <string>
#include <omp.h>
#include <string>
#include <thread>
#include <tlx/unused.hpp>
#include <networkit/Globals.hpp>
Expand Down
8 changes: 4 additions & 4 deletions include/networkit/generators/ErdosRenyiEnumerator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -299,14 +299,14 @@ class ErdosRenyiEnumerator final {

// SFINAE to allow using functors with and without thread id as parameter
template <typename Handle>
auto callHandle(Handle h, unsigned tid, node u, node v) const
-> decltype(h(0u, node{0}, node{0})) {
auto callHandle(Handle h, unsigned tid, node u,
node v) const -> decltype(h(0u, node{0}, node{0})) {
return h(tid, u, v);
}

template <typename Handle>
auto callHandle(Handle h, unsigned /*tid*/, node u, node v) const
-> decltype(h(node{0}, node{0})) {
auto callHandle(Handle h, unsigned /*tid*/, node u,
node v) const -> decltype(h(node{0}, node{0})) {
return h(u, v);
}
};
Expand Down
2 changes: 1 addition & 1 deletion include/networkit/graph/Attributes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class AttributeStorage final : public Base<NodeOrEdge, GraphType> {

private:
std::vector<T> values; // the real attribute storage
}; // class AttributeStorage<NodeOrEdge, Base, T>
}; // class AttributeStorage<NodeOrEdge, Base, T>

template <typename NodeOrEdge, typename GraphType, typename T, bool isConst>
class Attribute {
Expand Down
2 changes: 1 addition & 1 deletion include/networkit/graph/EdgeIterators.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class EdgeTypeRange {
public:
EdgeTypeRange(const GraphType &G) : G(&G) {}

EdgeTypeRange() : G(nullptr){};
EdgeTypeRange() : G(nullptr) {};

~EdgeTypeRange() = default;

Expand Down
12 changes: 6 additions & 6 deletions include/networkit/graph/Graph.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,8 @@ class Graph {
typename Aux::FunctionTraits<F>::template arg<2>::type>::value
&& std::is_same<edgeid, typename Aux::FunctionTraits<F>::template arg<3>::type>::
value>::type * = (void *)0>
auto edgeLambda(F &f, node u, node v, edgeweight ew, edgeid id) const
-> decltype(f(u, v, ew, id)) {
auto edgeLambda(F &f, node u, node v, edgeweight ew,
edgeid id) const -> decltype(f(u, v, ew, id)) {
return f(u, v, ew, id);
}

Expand Down Expand Up @@ -560,8 +560,8 @@ class Graph {
(Aux::FunctionTraits<F>::arity >= 2)
&& std::is_same<edgeweight, typename Aux::FunctionTraits<F>::template arg<
2>::type>::value>::type * = (void *)0>
auto edgeLambda(F &f, node u, node v, edgeweight ew, edgeid /*id*/) const
-> decltype(f(u, v, ew)) {
auto edgeLambda(F &f, node u, node v, edgeweight ew,
edgeid /*id*/) const -> decltype(f(u, v, ew)) {
return f(u, v, ew);
}

Expand All @@ -574,8 +574,8 @@ class Graph {
(Aux::FunctionTraits<F>::arity >= 1)
&& std::is_same<node, typename Aux::FunctionTraits<F>::template arg<
1>::type>::value>::type * = (void *)0>
auto edgeLambda(F &f, node u, node v, edgeweight /*ew*/, edgeid /*id*/) const
-> decltype(f(u, v)) {
auto edgeLambda(F &f, node u, node v, edgeweight /*ew*/,
edgeid /*id*/) const -> decltype(f(u, v)) {
return f(u, v);
}

Expand Down
4 changes: 2 additions & 2 deletions include/networkit/graph/GraphBuilder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ class GraphBuilder {
node source;
node destination;
// HalfEdge(node source, node destination);
HalfEdge(){};
HalfEdge(node source, node destination) : source(source), destination(destination){};
HalfEdge() {};
HalfEdge(node source, node destination) : source(source), destination(destination) {};
};

std::vector<std::vector<std::vector<HalfEdge>>>
Expand Down
4 changes: 2 additions & 2 deletions include/networkit/graph/GraphW.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ class GraphW final : public Graph {
public:
NeighborRange(const GraphW &G, node u) : G(&G), u(u) { assert(G.hasNode(u)); };

NeighborRange() : G(nullptr){};
NeighborRange() : G(nullptr) {};

NeighborIterator begin() const {
assert(G);
Expand Down Expand Up @@ -1037,7 +1037,7 @@ class GraphW final : public Graph {
public:
NeighborWeightRange(const GraphW &G, node u) : G(&G), u(u) { assert(G.hasNode(u)); };

NeighborWeightRange() : G(nullptr){};
NeighborWeightRange() : G(nullptr) {};

NeighborWeightIterator begin() const {
assert(G);
Expand Down
2 changes: 1 addition & 1 deletion include/networkit/graph/NodeIterators.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class NodeRangeBase {
public:
NodeRangeBase(const GraphType &G) : G(&G) {}

NodeRangeBase() : G(nullptr){};
NodeRangeBase() : G(nullptr) {};

~NodeRangeBase() = default;

Expand Down
2 changes: 1 addition & 1 deletion include/networkit/graph/RandomMaximumSpanningForest.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class RandomMaximumSpanningForest : public Algorithm {
&& (u > other.u || (u == other.u && v > other.v)))));
};
weightedEdge(node u, node v, double attribute, edgeid eid = 0)
: attribute(attribute), u(u), v(v), eid(eid), rand(Aux::Random::integer()){};
: attribute(attribute), u(u), v(v), eid(eid), rand(Aux::Random::integer()) {};
};

const Graph &G;
Expand Down
2 changes: 1 addition & 1 deletion include/networkit/graph/UnionMaximumSpanningForest.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class UnionMaximumSpanningForest final : public Algorithm {
&& (u > other.u || (u == other.u && v > other.v)));
};
weightedEdge(node u, node v, edgeweight attribute, edgeid eid = 0)
: attribute(attribute), u(u), v(v), eid(eid){};
: attribute(attribute), u(u), v(v), eid(eid) {};
};

const Graph *G;
Expand Down
2 changes: 1 addition & 1 deletion include/networkit/io/NetworkitBinaryReader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace NetworKit {
class NetworkitBinaryReader final : public GraphReader {

public:
NetworkitBinaryReader(){};
NetworkitBinaryReader() {};

GraphW read(std::string_view path) override;
GraphW readFromBuffer(const std::vector<uint8_t> &data);
Expand Down
4 changes: 2 additions & 2 deletions include/networkit/layout/LayoutAlgorithm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class LayoutAlgorithm {

public:
LayoutAlgorithm(const Graph &G)
: G(G){
: G(G) {

};
};

virtual void run() = 0;

Expand Down
2 changes: 1 addition & 1 deletion include/networkit/structures/LeastCommonAncestor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#ifndef NETWORKIT_STRUCTURES_LEAST_COMMON_ANCESTOR_HPP_
#define NETWORKIT_STRUCTURES_LEAST_COMMON_ANCESTOR_HPP_

#include <vector>
#include <span>
#include <vector>
#include "networkit/auxiliary/RangeMinimumQuery.hpp"
#include <networkit/Globals.hpp>
#include <networkit/graph/Graph.hpp>
Expand Down
8 changes: 4 additions & 4 deletions include/networkit/structures/LocalCommunity.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ class LocalCommunity {
throw std::runtime_error("Decreasing value that is missing");
}

OptionalValue(const ValueType &){};
OptionalValue(const ValueType &) {};

OptionalValue(){};
OptionalValue() {};
};

template <typename ValueType>
Expand Down Expand Up @@ -89,9 +89,9 @@ class LocalCommunity {
return *this;
}

OptionalValue(const ValueType &v) : value(v){};
OptionalValue(const ValueType &v) : value(v) {};

OptionalValue() : value(){};
OptionalValue() : value() {};

ValueType value;
};
Expand Down
21 changes: 12 additions & 9 deletions networkit/cpp/centrality/GroupClosenessGrowShrink.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,18 @@ GroupClosenessGrowShrink::GroupClosenessGrowShrink(const Graph &G, const std::ve
bool extended, count insertions,
count maxIterations)
: G(&G),
weightedImpl{G.isWeighted() ? std::make_unique<
GroupClosenessGrowShrinkDetails::GroupClosenessGrowShrinkImpl<edgeweight>>(
G, group, extended, insertions, maxIterations)
: nullptr},
unweightedImpl{G.isWeighted()
? nullptr
: std::make_unique<
GroupClosenessGrowShrinkDetails::GroupClosenessGrowShrinkImpl<count>>(
G, group, extended, insertions, maxIterations)} {}
weightedImpl{
G.isWeighted()
? std::make_unique<
GroupClosenessGrowShrinkDetails::GroupClosenessGrowShrinkImpl<edgeweight>>(
G, group, extended, insertions, maxIterations)
: nullptr},
unweightedImpl{
G.isWeighted()
? nullptr
: std::make_unique<
GroupClosenessGrowShrinkDetails::GroupClosenessGrowShrinkImpl<count>>(
G, group, extended, insertions, maxIterations)} {}

GroupClosenessGrowShrink::~GroupClosenessGrowShrink() = default;

Expand Down
1 change: 0 additions & 1 deletion networkit/cpp/coarsening/CoarsenedGraphView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,4 @@ CoarsenedGraphView::computeNeighbors(node supernode) const {
return neighbors;
}


} /* namespace NetworKit */
4 changes: 2 additions & 2 deletions networkit/cpp/community/ParallelLeiden.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <networkit/community/ParallelLeiden.hpp>
#include <cstdint>
#include <networkit/community/ParallelLeiden.hpp>

namespace NetworKit {
ParallelLeiden::ParallelLeiden(const Graph &graph, int iterations, bool randomize, double gamma)
Expand Down Expand Up @@ -588,4 +588,4 @@ Partition ParallelLeiden::parallelRefine(const Graph &graph) {
DEBUG("Ending refinement with ", refined.numberOfSubsets(), " partitions");
return refined;
}
} // namespace NetworKit
} // namespace NetworKit
44 changes: 16 additions & 28 deletions networkit/cpp/community/ParallelLeidenCPMScoringExtension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,28 @@ extern "C" double networkitParallelLeidenCommunityScore(double cutWeight, double
double communityVolume,
NetworKit::count subsetSize,
NetworKit::count communitySize,
double gamma,
double inverseGraphVolume) {
double gamma, double inverseGraphVolume) {
(void)degree;
(void)communityVolume;
(void)inverseGraphVolume;
return cutWeight
- gamma * static_cast<double>(subsetSize) * static_cast<double>(communitySize);
return cutWeight - gamma * static_cast<double>(subsetSize) * static_cast<double>(communitySize);
}

extern "C" double networkitParallelLeidenCurrentCommunityThreshold(double cutWeight, double degree,
double communityVolume,
NetworKit::count subsetSize,
NetworKit::count communitySize,
double gamma,
double inverseGraphVolume) {
extern "C" double networkitParallelLeidenCurrentCommunityThreshold(
double cutWeight, double degree, double communityVolume, NetworKit::count subsetSize,
NetworKit::count communitySize, double gamma, double inverseGraphVolume) {
(void)degree;
(void)communityVolume;
(void)inverseGraphVolume;
return cutWeight - gamma * static_cast<double>(subsetSize)
* static_cast<double>(communitySize - subsetSize);
return cutWeight
- gamma * static_cast<double>(subsetSize)
* static_cast<double>(communitySize - subsetSize);
}

extern "C" bool networkitParallelLeidenRefineRSetCondition(double cutWeight, double subsetVolume,
NetworKit::count subsetSize,
double targetVolume,
NetworKit::count targetSize,
double sourceVolume,
NetworKit::count sourceSize,
double gamma,
double inverseGraphVolume) {
extern "C" bool networkitParallelLeidenRefineRSetCondition(
double cutWeight, double subsetVolume, NetworKit::count subsetSize, double targetVolume,
NetworKit::count targetSize, double sourceVolume, NetworKit::count sourceSize, double gamma,
double inverseGraphVolume) {
(void)subsetVolume;
(void)targetVolume;
(void)sourceVolume;
Expand All @@ -48,14 +40,10 @@ extern "C" bool networkitParallelLeidenRefineRSetCondition(double cutWeight, dou
return cutWeight >= gamma * static_cast<double>(subsetSize) * static_cast<double>(targetSize);
}

extern "C" bool networkitParallelLeidenRefineTSetCondition(double cutWeight, double subsetVolume,
NetworKit::count subsetSize,
double targetVolume,
NetworKit::count targetSize,
double sourceVolume,
NetworKit::count sourceSize,
double gamma,
double inverseGraphVolume) {
extern "C" bool networkitParallelLeidenRefineTSetCondition(
double cutWeight, double subsetVolume, NetworKit::count subsetSize, double targetVolume,
NetworKit::count targetSize, double sourceVolume, NetworKit::count sourceSize, double gamma,
double inverseGraphVolume) {
(void)subsetVolume;
(void)targetVolume;
(void)sourceVolume;
Expand Down
Loading
Loading