netoptim 0.2__tar.gz → 0.3__tar.gz

{netoptim-0.2 → netoptim-0.3}/.gitignore

@@ -176,3 +176,7 @@ MANIFEST
 
 # my stuffs
 .hypothesis
+
+# Cache dirs
+.ruff_cache/
+.benchmarks/

netoptim-0.3/.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "python-envs.defaultEnvManager": "ms-python.python:conda",
+    "python-envs.defaultPackageManager": "ms-python.python:conda"
+}

netoptim-0.3/CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+
+## Version 0.3 (2026-07-16)
+
+### Documentation
+- **plot_directive with network flow examples**: Enabled matplotlib plot_directive for auto-generated figures. Added network flow and network oracle example plots. (#4ae94a8)
+
+### Bug Fixes
+- **mypy type annotation fixes**: Annotated `NegCycleFinder` with `float Domain` to prevent `int` default. Fixed `NetworkOracle.__init__` parameter types to `Dict[Any, float]`. (#336ef29)
+- **Float literal normalization**: Normalized integer literals to float in test graph data across cycle_finder, ratio, and stress_optscaling tests for type consistency. (#30f5d7a)
+- **Re-enabled disabled tests**: Fixed type annotations in `test_delay_padding` and re-enabled `test_maximize_slack`, `test_maximize_effective_slack`. (#8a76500)
+
+### Testing & Code Quality
+- **Delay padding implementation**: Added delay padding with enhanced cycle finder test cases. (#9df6788)
+- **Additional cycle finder tests**: Added extra test cases for cycle finder algorithms. (#9df6788)
+
+### Code Cleanup
+- **Removed PyScaffold boilerplate**: Deleted `skeleton.py`/`test_skeleton.py`, removed Python < 3.9 compat, dead entry points, stale `IFLOW.md`, duplicate `LICENSE`. (#4cd5756)
+
+### Build & CI
+- **CI repair**: Fixed broken entry_points and remaining skeleton imports. (#c2bf0d3)
+- **Dependency fixes**: Added explicit `mywheel` dep, PyPI-compatible version pins, removed redundant git+https installs. (#81b59c8, #2d232b7, #f07e1bf)

{netoptim-0.2/src/netoptim.egg-info → netoptim-0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netoptim
-Version: 0.2
+Version: 0.3
 Summary: Network Optimization Python Code
 Home-page: https://github.com/luk036/netoptim
 Author: Wai-Shing Luk
@@ -16,7 +16,9 @@ Classifier: Programming Language :: Python
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 License-File: LICENSE.txt
-Requires-Dist: importlib-metadata; python_version < "3.9"
+Requires-Dist: digraphx>=0.3
+Requires-Dist: ellalgo>=0.4
+Requires-Dist: mywheel>=0.3
 Requires-Dist: networkx
 Provides-Extra: testing
 Requires-Dist: setuptools; extra == "testing"

{netoptim-0.2 → netoptim-0.3}/docs/conf.py

@@ -48,6 +48,19 @@ extensions = [
     "sphinx.ext.mathjax",
     "sphinx.ext.napoleon",
     "sphinxcontrib.svgbob",
+    "matplotlib.sphinxext.plot_directive",
+]
+
+# -- matplotlib.sphinxext.plot_directive configuration -----------------------
+plot_html_show_source_link = True
+plot_html_show_formats = False
+plot_include_source = True
+plot_working_directory = os.path.join(__location__, "examples")
+plot_pre_code = [
+    "import matplotlib.pyplot as plt",
+    "import networkx as nx",
+    "import numpy as np",
+    "plt.rcParams['figure.dpi'] = 100",
 ]
 
 # Add any paths that contain templates here, relative to this directory.

netoptim-0.3/docs/examples/plot_network_flow.py

@@ -0,0 +1,36 @@
+"""
+Network Flow Graph
+==================
+
+Visualization of a directed flow network with edge capacities.
+"""
+import matplotlib.pyplot as plt
+import networkx as nx
+
+g = nx.DiGraph()
+edges = [
+    ("s", "a", 10),
+    ("s", "b", 5),
+    ("a", "b", 15),
+    ("a", "t", 10),
+    ("b", "t", 10),
+]
+for u, v, c in edges:
+    g.add_edge(u, v, capacity=c)
+
+plt.figure(figsize=(7, 5))
+pos = nx.spring_layout(g, seed=42)
+nx.draw(
+    g,
+    pos,
+    with_labels=True,
+    node_color="lightgreen",
+    node_size=800,
+    arrowsize=25,
+    font_weight="bold",
+    font_size=14,
+)
+edge_labels = {(u, v): f'cap={d["capacity"]}' for u, v, d in g.edges(data=True)}
+nx.draw_networkx_edge_labels(g, pos, edge_labels=edge_labels, font_size=11)
+plt.title("Flow Network with Edge Capacities")
+plt.grid(True, alpha=0.3)

netoptim-0.3/docs/examples/plot_network_oracle.py

@@ -0,0 +1,35 @@
+"""
+Network Oracle Example
+======================
+
+Demonstrates a parametric network with an oracle for cutting-plane optimization.
+"""
+import matplotlib.pyplot as plt
+import networkx as nx
+
+gra = {
+    "v1": {"v2": {"w": 3}, "v3": {"w": 4}},
+    "v2": {"v1": {"w": -2}, "v3": {"w": 1}},
+    "v3": {"v1": {"w": -3}, "v2": {"w": -2}},
+}
+
+g = nx.DiGraph()
+for u, neighbors in gra.items():
+    for v, attr in neighbors.items():
+        g.add_edge(u, v, w=attr["w"])
+
+plt.figure(figsize=(7, 5))
+pos = nx.spring_layout(g, seed=42)
+nx.draw(
+    g,
+    pos,
+    with_labels=True,
+    node_color="lightblue",
+    node_size=800,
+    arrowsize=25,
+    font_weight="bold",
+)
+edge_labels = {(u, v): f"w={d['w']}" for u, v, d in g.edges(data=True)}
+nx.draw_networkx_edge_labels(g, pos, edge_labels=edge_labels)
+plt.title("Parametric Network Oracle Graph")
+plt.grid(True, alpha=0.3)

netoptim-0.3/docs/figures_demo.md

@@ -0,0 +1,25 @@
+# Figures Demo
+
+Auto-generated figures demonstrating netoptim functionality.
+
+## Network Flow Graph
+
+```{plot} examples/plot_network_flow.py
+```
+
+## Network Oracle Example
+
+```{plot} examples/plot_network_oracle.py
+```
+
+### Inline Plot Example
+
+```{plot}
+import matplotlib.pyplot as plt
+import numpy as np
+
+x = np.linspace(0, 2 * np.pi, 100)
+plt.plot(x, np.sin(x))
+plt.title("Simple Sine Wave")
+plt.grid(True, alpha=0.3)
+```

{netoptim-0.2 → netoptim-0.3}/docs/index.md

@@ -22,6 +22,7 @@ Contributions & Help <contributing>
 License <license>
 Authors <authors>
 Changelog <changelog>
+Figures Demo <figures_demo>
 Module Reference <api/modules>
 ```
 

{netoptim-0.2 → netoptim-0.3}/mypy.ini

@@ -5,19 +5,14 @@ warn_unused_configs = True
 [mypy-setuptools.*]
 ignore_missing_imports = True
 
-[mypy-networkx.*]
 ignore_missing_imports = True
 
-[mypy-numpy.*]
 ignore_missing_imports = True
 
-[mypy-scipy.*]
 ignore_missing_imports = True
 
-[mypy-Cython.*]
 ignore_missing_imports = True
 
-[mypy-json.*]
 ignore_missing_imports = True
 
 [mypy-matplotlib.*]

{netoptim-0.2 → netoptim-0.3}/setup.cfg

@@ -26,7 +26,9 @@ package_dir =
 	=src
 python_requires = >=3.9
 install_requires = 
-	importlib-metadata; python_version<"3.9"
+	digraphx>=0.3
+	ellalgo>=0.4
+	mywheel>=0.3
 	networkx
 
 [options.packages.find]
@@ -43,8 +45,6 @@ testing =
 	numpy
 	icecream
 
-[options.entry_points]
-
 [tool:pytest]
 addopts = 
 	--cov netoptim --cov-report term-missing

{netoptim-0.2 → netoptim-0.3}/src/netoptim/network_oracle.py

@@ -42,7 +42,7 @@ class NetworkOracle:
         ...     "v2": {"v1": {"w": -2}, "v3": {"w": 1}},
         ...     "v3": {"v1": {"w": -3}, "v2": {"w": -2}},
         ... }
-        >>> u = {"v1": 0, "v2": 0, "v3": 0}
+        >>> u = {"v1": 0.0, "v2": 0.0, "v3": 0.0}
         >>> oracle = Mock()
         >>> oracle.eval.side_effect = lambda e, x: e["w"] - x
         >>> oracle.grad.side_effect = lambda e, x: -1
@@ -51,7 +51,7 @@ class NetworkOracle:
         (2, 3)
     """
 
-    def __init__(self, gra: Graph, u: Dict[Any, int], oracle: Any) -> None:
+    def __init__(self, gra: Graph, u: Dict[Any, float], oracle: Any) -> None:
         """
         Initialize the network oracle with a graph, node potentials, and an edge oracle.
 
@@ -66,7 +66,7 @@ class NetworkOracle:
         self._gra = gra
         self._potential = u
         self._oracle = oracle
-        self._ncf = NegCycleFinder(gra)
+        self._ncf: NegCycleFinder[Any, Any, float] = NegCycleFinder(gra)
 
     def update(self, t: float) -> None:
         """Update the oracle with the best-so-far optimal value.

{netoptim-0.2 → netoptim-0.3/src/netoptim.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netoptim
-Version: 0.2
+Version: 0.3
 Summary: Network Optimization Python Code
 Home-page: https://github.com/luk036/netoptim
 Author: Wai-Shing Luk
@@ -16,7 +16,9 @@ Classifier: Programming Language :: Python
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 License-File: LICENSE.txt
-Requires-Dist: importlib-metadata; python_version < "3.9"
+Requires-Dist: digraphx>=0.3
+Requires-Dist: ellalgo>=0.4
+Requires-Dist: mywheel>=0.3
 Requires-Dist: networkx
 Provides-Extra: testing
 Requires-Dist: setuptools; extra == "testing"

{netoptim-0.2 → netoptim-0.3}/src/netoptim.egg-info/SOURCES.txt

@@ -13,8 +13,6 @@ CHANGELOG.md
 CHANGELOG.rst
 CONTRIBUTING.md
 GEMINI.md
-IFLOW.md
-LICENSE
 LICENSE.txt
 README.md
 README.rst
@@ -34,11 +32,13 @@ tox.ini
 .github/workflows/python-app.yml
 .github/workflows/python-package.yml
 .github/workflows/python-publish.yml
+.vscode/settings.json
 docs/Makefile
 docs/authors.md
 docs/changelog.md
 docs/conf.py
 docs/contributing.md
+docs/figures_demo.md
 docs/index.md
 docs/license.md
 docs/readme.md
@@ -46,6 +46,8 @@ docs/requirements.txt
 docs/_static/.gitignore
 docs/api/modules.rst
 docs/api/netoptim.rst
+docs/examples/plot_network_flow.py
+docs/examples/plot_network_oracle.py
 experiments/plot_node_colormap.ipynb
 experiments/plot_node_colormap.py
 requirements/README.md
@@ -61,6 +63,8 @@ src/netoptim.egg-info/SOURCES.txt
 src/netoptim.egg-info/dependency_links.txt
 src/netoptim.egg-info/not-zip-safe
 src/netoptim.egg-info/requires.txt
+src/netoptim.egg-info/scm_file_list.json
+src/netoptim.egg-info/scm_version.json
 src/netoptim.egg-info/top_level.txt
 tests/__init__.py
 tests/conftest.py

{netoptim-0.2 → netoptim-0.3}/src/netoptim.egg-info/requires.txt

@@ -1,8 +1,8 @@
+digraphx>=0.3
+ellalgo>=0.4
+mywheel>=0.3
 networkx
 
-[:python_version < "3.9"]
-importlib-metadata
-
 [testing]
 setuptools
 pytest

netoptim-0.3/src/netoptim.egg-info/scm_file_list.json

@@ -0,0 +1,75 @@
+{
+  "files": [
+    ".coveragerc",
+    ".pre-commit-config.yaml",
+    "mypy.ini",
+    ".markdownlint.json",
+    "README.md",
+    "environment.yml",
+    "setup.cfg",
+    "tox.ini",
+    "LICENSE.txt",
+    "setup.py",
+    "pyproject.toml",
+    "CHANGELOG.rst",
+    "requirements.txt",
+    "CHANGELOG.md",
+    "CONTRIBUTING.md",
+    "README.rst",
+    ".isort.cfg",
+    "AUTHORS.md",
+    "note.md",
+    ".gitpod.yml",
+    ".readthedocs.yml",
+    "_config.yml",
+    ".gitignore",
+    ".flake8",
+    "AUTHORS.rst",
+    ".shellcheckrc",
+    "GEMINI.md",
+    ".vscode/settings.json",
+    "docs/figures_demo.md",
+    "docs/readme.md",
+    "docs/Makefile",
+    "docs/authors.md",
+    "docs/requirements.txt",
+    "docs/contributing.md",
+    "docs/license.md",
+    "docs/changelog.md",
+    "docs/conf.py",
+    "docs/index.md",
+    "docs/api/modules.rst",
+    "docs/api/netoptim.rst",
+    "docs/_static/.gitignore",
+    "docs/examples/plot_network_flow.py",
+    "docs/examples/plot_network_oracle.py",
+    "src/netoptim/py.typed",
+    "src/netoptim/__init__.py",
+    "src/netoptim/optscaling_oracle.py",
+    "src/netoptim/network_oracle.py",
+    "tests/test_cycle_finder.py",
+    "tests/test_delay_padding.py",
+    "tests/test_network_oracle2.py",
+    "tests/test_stress_network_oracle.py",
+    "tests/test_optscaling.py",
+    "tests/test_network_oracle.py",
+    "tests/__init__.py",
+    "tests/test_ratio.py",
+    "tests/test_cycle_finder2.py",
+    "tests/test_stress_optscaling.py",
+    "tests/conftest.py",
+    "requirements/doc.txt",
+    "requirements/README.md",
+    "requirements/default.txt",
+    "requirements/test.txt",
+    "experiments/plot_node_colormap.py",
+    "experiments/plot_node_colormap.ipynb",
+    ".github/workflows/python-publish.yml",
+    ".github/workflows/ci.bak",
+    ".github/workflows/multi-platforms.yml",
+    ".github/workflows/jekyll-gh-pages.yml",
+    ".github/workflows/python-app.yml",
+    ".github/workflows/multi-platforms.bak",
+    ".github/workflows/python-package.yml"
+  ]
+}

netoptim-0.3/src/netoptim.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.3",
+  "distance": 0,
+  "node": "gf84cbe013b0fb69e52aafbc1356c76d45531beb9",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-16"
+}

{netoptim-0.2 → netoptim-0.3}/tests/test_cycle_finder.py

@@ -56,9 +56,9 @@ def run_lawler_prop(finder: Any, dist: Dict[str, float], beta: float) -> bool:
 def test_minimize_TCP(finder_class: Any) -> None:
     dist: Dict[str, float] = {"v1": 0.0, "v2": 0.0, "v3": 0.0}
     Digraph: Dict[str, Dict[str, Dict[str, Any]]] = {
-        "v1": {"v2": {"type": "s", "delay": 2}, "v3": {"type": "h", "delay": 1.5}},
-        "v2": {"v3": {"type": "s", "delay": 3}, "v1": {"type": "h", "delay": 2.0}},
-        "v3": {"v1": {"type": "s", "delay": 4}, "v2": {"type": "h", "delay": 3.0}},
+        "v1": {"v2": {"type": "s", "delay": 2.0}, "v3": {"type": "h", "delay": 1.5}},
+        "v2": {"v3": {"type": "s", "delay": 3.0}, "v1": {"type": "h", "delay": 2.0}},
+        "v3": {"v1": {"type": "s", "delay": 4.0}, "v2": {"type": "h", "delay": 3.0}},
     }
 
     def has_negative_cycle(TCP: float, dist: Dict[str, float]) -> bool:
@@ -83,9 +83,9 @@ def test_maximize_slack(finder_class: Any) -> None:
     dist: Dict[str, float] = {"v1": 0.0, "v2": 0.0, "v3": 0.0}
     TCP = 4.5
     Digraph: Dict[str, Dict[str, float]] = {
-        "v1": {"v2": TCP - 2, "v3": 1.5},
-        "v2": {"v3": TCP - 3, "v1": 2.0},
-        "v3": {"v1": TCP - 4, "v2": 3.0},
+        "v1": {"v2": TCP - 2.0, "v3": 1.5},
+        "v2": {"v3": TCP - 3.0, "v1": 2.0},
+        "v3": {"v1": TCP - 4.0, "v2": 3.0},
     }
 
     def has_negative_cycle_EVEN(beta: float, dist: Dict[str, float]) -> bool:
@@ -110,9 +110,18 @@ def test_maximize_effective_slack(finder_class: Any) -> None:
     dist: Dict[str, float] = {"v1": 0.0, "v2": 0.0, "v3": 0.0}
     TCP = 4.5
     Digraph: Dict[str, Dict[str, Dict[str, float]]] = {
-        "v1": {"v2": {"cost": TCP - 2, "time": 3.1}, "v3": {"cost": 1.5, "time": 0.7}},
-        "v2": {"v3": {"cost": TCP - 3, "time": 4.1}, "v1": {"cost": 2.0, "time": 2.2}},
-        "v3": {"v1": {"cost": TCP - 4, "time": 5.1}, "v2": {"cost": 3.0, "time": 1.5}},
+        "v1": {
+            "v2": {"cost": TCP - 2.0, "time": 3.1},
+            "v3": {"cost": 1.5, "time": 0.7},
+        },
+        "v2": {
+            "v3": {"cost": TCP - 3.0, "time": 4.1},
+            "v1": {"cost": 2.0, "time": 2.2},
+        },
+        "v3": {
+            "v1": {"cost": TCP - 4.0, "time": 5.1},
+            "v2": {"cost": 3.0, "time": 1.5},
+        },
     }
 
     def has_negative_cycle_PROP(beta: float, dist: Dict[str, float]) -> bool:

{netoptim-0.2 → netoptim-0.3}/tests/test_cycle_finder2.py

@@ -82,19 +82,19 @@ class MyBSOracle(OracleBS):
 @pytest.mark.parametrize("finder_class", Finders)
 def test_minimize_TCP2(finder_class: Any, dist: Dict[str, float]) -> None:
     Digraph: Dict[str, Dict[str, Dict[str, Any]]] = {
-        "v0": {"v3": {"type": "s", "delay": 6}, "v2": {"type": "s", "delay": 7}},
-        "v1": {"v2": {"type": "s", "delay": 9}, "v4": {"type": "h", "delay": 3}},
+        "v0": {"v3": {"type": "s", "delay": 6.0}, "v2": {"type": "s", "delay": 7.0}},
+        "v1": {"v2": {"type": "s", "delay": 9.0}, "v4": {"type": "h", "delay": 3.0}},
         "v2": {
-            "v0": {"type": "h", "delay": 6},
-            "v1": {"type": "h", "delay": 6},
-            "v3": {"type": "s", "delay": 6},
+            "v0": {"type": "h", "delay": 6.0},
+            "v1": {"type": "h", "delay": 6.0},
+            "v3": {"type": "s", "delay": 6.0},
         },
         "v3": {
-            "v4": {"type": "s", "delay": 8},
-            "v0": {"type": "h", "delay": 6},
-            "v2": {"type": "h", "delay": 6},
+            "v4": {"type": "s", "delay": 8.0},
+            "v0": {"type": "h", "delay": 6.0},
+            "v2": {"type": "h", "delay": 6.0},
         },
-        "v4": {"v1": {"type": "s", "delay": 3}, "v3": {"type": "h", "delay": 8}},
+        "v4": {"v1": {"type": "s", "delay": 3.0}, "v3": {"type": "h", "delay": 8.0}},
     }
 
     def has_negative_cycle(TCP: float, dist: Dict[str, float]) -> bool:
@@ -117,11 +117,11 @@ def test_minimize_TCP2(finder_class: Any, dist: Dict[str, float]) -> None:
 def test_maximize_slack(finder_class: Any, dist: Dict[str, float]) -> None:
     TCP = 7.5
     Digraph: Dict[str, Dict[str, float]] = {
-        "v0": {"v3": TCP - 6, "v2": TCP - 7},
-        "v1": {"v2": TCP - 9, "v4": 3},
-        "v2": {"v0": 6, "v1": 6, "v3": TCP - 6},
-        "v3": {"v4": TCP - 8, "v0": 6, "v2": 6},
-        "v4": {"v1": TCP - 3, "v3": 8},
+        "v0": {"v3": TCP - 6.0, "v2": TCP - 7.0},
+        "v1": {"v2": TCP - 9.0, "v4": 3.0},
+        "v2": {"v0": 6.0, "v1": 6.0, "v3": TCP - 6.0},
+        "v3": {"v4": TCP - 8.0, "v0": 6.0, "v2": 6.0},
+        "v4": {"v1": TCP - 3.0, "v3": 8.0},
     }
 
     def has_negative_cycle_EVEN(beta: float, dist: Dict[str, float]) -> bool:
@@ -142,21 +142,27 @@ def test_maximize_effective_slack(finder_class: Any, dist: Dict[str, float]) ->
     TCP = 7.5
     Digraph: Dict[str, Dict[str, Dict[str, float]]] = {
         "v0": {
-            "v3": {"cost": TCP - 6, "time": 3.1},
-            "v2": {"cost": TCP - 7, "time": 1.5},
+            "v3": {"cost": TCP - 6.0, "time": 3.1},
+            "v2": {"cost": TCP - 7.0, "time": 1.5},
+        },
+        "v1": {
+            "v2": {"cost": TCP - 9.0, "time": 4.1},
+            "v4": {"cost": 3.0, "time": 1.0},
         },
-        "v1": {"v2": {"cost": TCP - 9, "time": 4.1}, "v4": {"cost": 3, "time": 1.0}},
         "v2": {
-            "v0": {"cost": 6, "time": 3.1},
-            "v1": {"cost": 6, "time": 2.5},
-            "v3": {"cost": TCP - 6, "time": 3.1},
+            "v0": {"cost": 6.0, "time": 3.1},
+            "v1": {"cost": 6.0, "time": 2.5},
+            "v3": {"cost": TCP - 6.0, "time": 3.1},
         },
         "v3": {
-            "v4": {"cost": TCP - 8, "time": 4.1},
-            "v0": {"cost": 6, "time": 2.5},
-            "v2": {"cost": 6, "time": 2.5},
+            "v4": {"cost": TCP - 8.0, "time": 4.1},
+            "v0": {"cost": 6.0, "time": 2.5},
+            "v2": {"cost": 6.0, "time": 2.5},
+        },
+        "v4": {
+            "v1": {"cost": TCP - 3.0, "time": 1.1},
+            "v3": {"cost": 8.0, "time": 1.5},
         },
-        "v4": {"v1": {"cost": TCP - 3, "time": 1.1}, "v3": {"cost": 8, "time": 1.5}},
     }
 
     def has_negative_cycle_PROP(beta: float, dist: Dict[str, float]) -> bool: