fix pairwise option

Author: saibalmars

GraphRicciCurvature/OllivierRicci.py

@@ -149,7 +149,17 @@ def _distribute_densities(source, target):
     # construct the cost dictionary from x to y
     t0 = time.time()
 
-    d = _apsp[np.ix_(source_topknbr, target_topknbr)]   # transportation matrix
+    if _shortest_path == "pairwise":
+        d = []
+        for src in source_topknbr:
+            tmp = []
+            for tgt in target_topknbr:
+                tmp.append(_source_target_shortest_path(src, tgt))
+            d.append(tmp)
+        d = np.array(d)
+    else:   # all_pairs
+        d = _apsp[np.ix_(source_topknbr, target_topknbr)]   # transportation matrix
+
     x = np.array([x]).T  # the mass that source neighborhood initially owned
     y = np.array([y]).T  # the mass that target neighborhood needs to received
 
@@ -181,29 +191,6 @@ def _source_target_shortest_path(source, target):
     return length
 
 
-def _get_pairwise_sp(source, target):
-    """Compute pairwise shortest path from `source` to `target`.
-
-    Parameters
-    ----------
-    source : int
-        Source node index in Networkit graph `_Gk`.
-    target : int
-        Target node index in Networkit graph `_Gk`.
-
-    Returns
-    -------
-    length : float
-        Pairwise shortest path length.
-
-    """
-
-    if _shortest_path == "pairwise":
-        return _source_target_shortest_path(source, target)
-
-    return _apsp[source][target]
-
-
 def _get_all_pairs_shortest_path():
     """Pre-compute all pairs shortest paths of the assigned graph `_Gk`."""
     logger.info("Start to compute all pair shortest path.")