Update steiner tree method

saezlab · Jul 30, 2024 · fea0437 · fea0437
1 parent 63231b3
commit fea0437
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/corneto/_graph.py b/corneto/_graph.py
@@ -699,8 +699,13 @@ def to_networkx(self):
     @staticmethod
     def from_networkx(G: Union[NxGraph, NxDiGraph]):
         Gc = Graph()
+        is_directed = G.is_directed()
         for edge in G.edges():
             e_data = G.get_edge_data(edge[0], edge[1], default=dict())
+            if is_directed:
+                e_data[Attr.EDGE_TYPE.value] = EdgeType.DIRECTED.value
+            else:
+                e_data[Attr.EDGE_TYPE.value] = EdgeType.UNDIRECTED.value
             Gc.add_edge(edge[0], edge[1], **e_data)
         return Gc
 

diff --git a/corneto/_util.py b/corneto/_util.py
@@ -1,6 +1,6 @@
 import hashlib
-import pickle
 import os
+import pickle
 from collections import OrderedDict
 from itertools import filterfalse
 from typing import Any, Callable, Dict, Iterable, Optional, Set, TypeVar
@@ -144,7 +144,7 @@ def _get_info() -> Dict[str, Dict]:
     info["installed_path"] = {
         "title": "Installed path",
         "message": os.path.dirname(__file__),
-        "value": os.path.dirname(__file__)
+        "value": os.path.dirname(__file__),
     }
     info["repo_url"] = {
         "title": "Repository",

diff --git a/corneto/methods/steiner.py b/corneto/methods/steiner.py
@@ -168,7 +168,9 @@ def exact_steiner_tree(
     if edge_weights is None:
         edge_weights = np.array([prop.get("weight", 0) for prop in Gc.get_attr_edges()])
     elif isinstance(edge_weights, (list, tuple)):
-        edge_weights = np.array(edge_weights)
+        ew = np.zeros(Gc.ne)
+        ew[: len(edge_weights)] = np.array(edge_weights)
+        edge_weights = ew
     else:
         raise ValueError("Unknown type for edge_weights (list or tuple)")