Merge pull request #73 from stdgraph/multipartite

Multipartite
stdgraph · Nov 1, 2023 · 543828b · 543828b
2 parents 021e7b6 + 9cf7b2a
commit 543828b
Show file tree

Hide file tree

Showing 4 changed files with 744 additions and 7 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -9,7 +9,7 @@
     {
       "name": "linux-common",
       "hidden": true,
-      "generator": "Ninja",
+      "generator": "Ninja Multi-Config",
       "binaryDir": "${sourceDir}/out/build/${presetName}",
       "cacheVariables": {
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
@@ -121,8 +121,8 @@
     {
       "name": "macos-default",
       "displayName": "macOS Debug",
-      "description": "Target a remote macOS system with Ninja",
-      "generator": "Ninja",
+      "description": "Target a remote macOS system with Ninja Multi-Config",
+      "generator": "Ninja Multi-Config",
       "binaryDir": "${sourceDir}/out/build/${presetName}",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
@@ -145,7 +145,7 @@
     {
       "name": "windows-common",
       "hidden": true,
-      "generator": "Ninja",
+      "generator": "Ninja Multi-Config",
       "architecture": {
         "value": "x64",
         "strategy": "external"

diff --git a/include/graph/algorithm/pagerank.hpp b/include/graph/algorithm/pagerank.hpp
@@ -72,15 +72,15 @@ void pagerank(
   std::vector<weight_type> iweights(size(vertices(g)));
 
   // Initialize the data, pagerank as 1/n_vertices.
-  std::ranges::fill(scores, 1.0f / size(vertices(g)));
+  std::ranges::fill(scores, 1.0 / double(size(vertices(g))));
 
   for (auto&& [uid, u] : views::vertexlist(g)) {
     // Calculate the degree of each vertex.
     size_t edge_cnt = 0;
     for (auto&& uv : edges(g, u)) {
       ++edge_cnt;
     }
-    degrees[uid] = edge_cnt;
+    degrees[uid] = static_cast<id_type>(edge_cnt);
 
     // Find the sum of outgoing weights.
     weight_type val = 0;
@@ -102,7 +102,7 @@ void pagerank(
       dsum += (iweights[uid] == 0) ? damping_factor * scores[uid] : 0;
     }
 
-    std::ranges::fill(scores, (1 - damping_factor + dsum) / size(vertices(g)));
+    std::ranges::fill(scores, (1 - damping_factor + dsum) / double(size(vertices(g))));
 
     double error = 0;
     for (auto&& [uid, vid, uv, val] : views::edgelist(g, weight_fn)) {