fix: Solve test networkx

mapequation · Jun 20, 2024 · ffc9b0b · ffc9b0b
1 parent a2f3b15
commit ffc9b0b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/interfaces/python/infomap.py b/interfaces/python/infomap.py
@@ -1193,7 +1193,9 @@ def add_networkx_graph(
         >>> G.add_edge("d", "f")
         >>> G.add_edge("e", "f")
         >>> im = Infomap(silent=True)
-        >>> im.add_networkx_graph(G)
+        >>> mapping = im.add_networkx_graph(G)
+        >>> mapping
+        {0: 'a', 1: 'b', 2: 'c', 3: 'd', 4: 'e', 5: 'f'}
         >>> im.run()
         >>> for node in im.nodes:
         ...     print(node.node_id, node.module_id, node.flow, node.state_id)
@@ -1216,7 +1218,7 @@ def add_networkx_graph(
         >>> G.add_edge(11, 21)
         >>> G.add_edge(22, 23)
         >>> im = Infomap(silent=True)
-        >>> im.add_networkx_graph(G)
+        >>> mapping = im.add_networkx_graph(G)
         >>> im.run()
         >>> for node in im.nodes:
         ...     print(node.node_id, node.module_id, node.flow, node.state_id, node.layer_id)

diff --git a/src/io/Network.h b/src/io/Network.h
@@ -103,6 +103,12 @@ class Network : public StateNetwork {
   void generateStateNetworkFromMultilayerWithSimulatedInterLinks();
   void simulateInterLayerLinks();
 
+  /**
+   * Create state node corresponding to this multilayer node if not already exist
+   * @return state node id
+   */
+  unsigned int addMultilayerNode(unsigned int layerId, unsigned int physicalId, double weight = 1.0);
+
   void addMultilayerLink(unsigned int layer1, unsigned int n1, unsigned int layer2, unsigned int n2, double weight);
 
   /**
@@ -188,12 +194,6 @@ class Network : public StateNetwork {
    */
   void parseMultilayerInterLink(const std::string& line, unsigned int& layer1, unsigned int& n, unsigned int& layer2, double& weight);
 
-  /**
-   * Create state node corresponding to this multilayer node if not already exist
-   * @return state node id
-   */
-  unsigned int addMultilayerNode(unsigned int layerId, unsigned int physicalId, double weight = 1.0);
-
   static double calculateJensenShannonDivergence(bool& intersect, const OutLinkMap& layer1OutLinks, double sumOutLinkWeightLayer1, const OutLinkMap& layer2OutLinks, double sumOutLinkWeightLayer2);
 
   void printSummary();