Merge 6ff53fb into 78e186c

include/networkit/centrality/TopCloseness.hpp

@@ -7,16 +7,19 @@
 
 #ifndef TOPCLOSENESS_H_
 #define TOPCLOSENESS_H_
-#include <networkit/auxiliary/PrioQueue.hpp>
+
+#include <memory>
+
 #include <networkit/base/Algorithm.hpp>
+#include <networkit/components/StronglyConnectedComponents.hpp>
 #include <networkit/graph/Graph.hpp>
 
 namespace NetworKit {
 
 /**
  * @ingroup centrality
  */
-class TopCloseness : public Algorithm {
+class TopCloseness final : public Algorithm {
 public:
   /**
    * Finds the top k nodes with highest closeness centrality faster than
@@ -46,7 +49,7 @@ class TopCloseness : public Algorithm {
   /**
    * Computes top-k closeness on the graph passed in the constructor.
    */
-  void run();
+  void run() override;
 
   /**
    * Returns a list with the k nodes with highest closeness.
@@ -70,38 +73,53 @@ class TopCloseness : public Algorithm {
    */
   std::vector<edgeweight> topkScoresList(bool includeTrail = false);
 
-protected:
-  Graph G;
+private:
+  const Graph &G;
   count n;
   count k;
   bool first_heu, sec_heu;
   std::vector<node> topk;
-  count visEdges = 0;
-  count n_op = 0;
-  count trail = 0;
-  double maxFarness = -1.f;
-  count nMaxFarness = 0;
-  std::vector<std::vector<node>> levels;
-  std::vector<count> nodesPerLev;
-  count nLevs = 0;
+  count visEdges;
+  count n_op;
+  count trail;
+  double maxFarness = -1.0;
+  count nMaxFarness;
+  std::vector<std::vector<count>> nodesPerLevs, sumLevels;
   std::vector<edgeweight> topkScores;
-  std::vector<count> maxlevel;
-  std::vector<count> maxlevelSize;
-  std::vector<std::vector<count>> subtree;
   std::vector<double> farness;
   std::vector<count> reachL;
   std::vector<count> reachU;
-  std::vector<count> component;
+
+  std::unique_ptr<StronglyConnectedComponents> sccsPtr;
 
   void init();
-  double BFScut(node v, double x, bool *visited, count *distances, node *pred,
-                count *visEdges);
+  double BFScut(node v, double x, std::vector<bool> &visited, std::vector<count> &distances,
+                std::vector<node> &pred, count &visEdges);
   void computelBound1(std::vector<double> &S);
-  void BFSbound(node x, std::vector<double> &S, count *visEdges,
+  void BFSbound(node x, std::vector<double> &S, count &visEdges,
                 const std::vector<bool> &toAnalyze);
   void computeReachable();
   void computeReachableNodesUndir();
   void computeReachableNodesDir();
+
+  // Returns the node with highest farness
+  struct LargerFarness {
+  public:
+    LargerFarness(const std::vector<double> &v_) : v(v_) {}
+    bool operator()(node x, node y) const { return v[x] > v[y]; }
+
+  private:
+    const std::vector<double> &v;
+  };
+
+  struct SmallerFarness {
+  public:
+      SmallerFarness(const std::vector<double> &v_) : v(v_) {}
+      bool operator()(node x, node y) const { return v[x] < v[y]; }
+
+  private:
+      const std::vector<double> &v;
+  };
 };
 
 inline std::vector<node> TopCloseness::topkNodesList(bool includeTrail) {
@@ -122,6 +140,7 @@ inline std::vector<edgeweight> TopCloseness::topkScoresList(bool includeTrail) {
     std::vector<double> topkScoresNoTrail(begin, begin + k);
     return topkScoresNoTrail;
   }
+
   return topkScores;
 }