improved reading

Author: alexandrutomescu

flowpaths/abstractwalkmodeldigraph.py

@@ -221,8 +221,8 @@ def _encode_walks(self):
 
         # Edge selected constraints
 
-        # 19a: If y[(u,v,i)] = 1, then x[(u,v,i)] = 1
-        # Equivalently, y[(u,v,i)] cannot be 1 without x[(u,v,i)] being 1
+        # 19a: If y[(u,v,i)] = 1, then x[(u,v,i)] >= 1
+        # Equivalently, y[(u,v,i)] cannot be 1 without x[(u,v,i)] being at least 1
         for i in range(self.k):
             for (u,v) in self.G.edges:
                 self.solver.add_constraint(

flowpaths/utils/graphutils.py

@@ -1,6 +1,9 @@
 from itertools import count
 import networkx as nx
 import flowpaths.utils as utils
+# NOTE: Do NOT import flowpaths.stdigraph at module import time to avoid a circular
+# import chain: stdag -> graphutils -> stdigraph -> stdag. We instead lazily import
+# stdigraph inside functions that need it (e.g. read_graph) after this module is fully loaded.
 
 bigNumber = 1 << 32
 
@@ -125,6 +128,12 @@ def read_graph(graph_raw) -> nx.DiGraph:
                 utils.logger.error(f"{__name__}: Constraint edge ({u}, {v}) not found in graph {graph_id} edges.")
                 raise ValueError(f"Constraint edge ({u}, {v}) not found in graph edges.")
 
+    G.graph["n"] = G.number_of_nodes()
+    G.graph["m"] = G.number_of_edges()
+    # Lazy import here to avoid circular import at module load time
+    from flowpaths import stdigraph as _stdigraph  # type: ignore
+    G.graph["w"] = _stdigraph.stDiGraph(G).get_width()
+
     return G
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flowpaths"
-version = "0.2.00" 
+version = "0.2.1" 
 description = "A Python package to quickly decompose weighted graphs into weights paths, under various models."
 readme = "README.md"
 authors = [{name="Graph Algorithms and Bioinformatics Group @ University of Helsinki, and external collaborators"}]