Merge pull request #114 from stephenhky/develop

Remove `nptyping`

Author: stephenhky

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "graphflow"
-version = "0.7.0"
+version = "0.7.1"
 authors = [
     {name = "Kwan Yuet Stephen Ho", email = "stephenhky@yahoo.com.hk"}
 ]
@@ -26,11 +26,12 @@ classifiers=[
       "Programming Language :: C",
       "License :: OSI Approved :: MIT License",
 ]
-dependencies = ["Cython>=0.29.0", "numpy>=1.20.0", "networkx>=3.0", "sparse>=0.10.0", "nptyping"]
+dependencies = ["Cython>=0.29.0", "numpy>=1.20.0", "networkx>=3.0", "sparse>=0.10.0"]
 
 [project.urls]
 Repository = "https://github.com/stephenhky/GraphFlow"
 Issues = "https://github.com/stephenhky/GraphFlow/issues"
+Documentation = "https://graphflow.readthedocs.io"
 
 [tool.setuptools]
 packages = [

src/graphflow/hits/hitsrank.py

@@ -1,19 +1,21 @@
 
 # Jon Kleinberg's HITS (Hyperlink-Induced Topic Search) algorithm
 
+from typing import Literal, Annotated
+
 import networkx
 import numpy as np
 import networkx as nx
-from nptyping import NDArray, Shape, Float
+from numpy.typing import NDArray
 
 from .. import L1norm
 
 
 def hits(
-        adjMatrix: NDArray[Shape["*, *"], Float],
+        adjMatrix: Annotated[NDArray[np.float64], Literal["2D Array"]],
         eps: float=1e-4,
         maxstep: int=1000
-) -> tuple[NDArray[Shape["*"], Float], NDArray[Shape["*"], Float]]:
+) -> tuple[Annotated[NDArray[np.float64], Literal["1D Array"]], Annotated[NDArray[np.float64], Literal["1D Array"]]]:
     """
     Compute the HITS (Hyperlink-Induced Topic Search) algorithm on an adjacency matrix.
     
@@ -64,7 +66,7 @@ def CalculateHITS(
         digraph: networkx.DiGraph,
         eps: float=1e-4,
         maxstep: int=1000
-) -> tuple[NDArray[Shape["*"], Float], NDArray[Shape["*"], Float]]:
+) -> tuple[Annotated[NDArray[np.float64], Literal["1D Array"]], Annotated[NDArray[np.float64], Literal["1D Array"]]]:
     """
     Compute the HITS (Hyperlink-Induced Topic Search) algorithm on a NetworkX digraph.
     

src/graphflow/pagerank/GooglePageRank.py

@@ -1,10 +1,10 @@
 
 import warnings
-from typing import Tuple
+from typing import Annotated, Literal
 
 import networkx
 import numpy as np
-from nptyping import NDArray, Shape, Float
+from numpy.typing import NDArray
 
 from .cpagerank import pagerank_cython
 from .. import L1norm, PageRankLanguage
@@ -13,7 +13,7 @@
 def GoogleMatrix(
         digraph: networkx.DiGraph,
         beta: float
-) -> Tuple[NDArray[Shape["*, *"], Float], dict[str, int]]:
+) -> tuple[Annotated[NDArray[np.float64], Literal["1D Array"]], dict[str, int]]:
     """
     Compute the Google Matrix for a directed graph.
     
@@ -43,7 +43,7 @@ def GoogleMatrix(
 
 
 def CalculatePageRankFromAdjacencyMatrix_Cython(
-        adjMatrix: NDArray[Shape["*, *"], Float],
+        adjMatrix: Annotated[NDArray[np.float64], Literal["2D Array"]],
         nodes: dict[str, int],
         eps: float=1e-4,
         maxstep: int=1000
@@ -52,7 +52,7 @@ def CalculatePageRankFromAdjacencyMatrix_Cython(
 
 
 def CalculatePageRankFromAdjacencyMatrix_Python(
-        adjMatrix: NDArray[Shape["*, *"], Float],
+        adjMatrix: Annotated[NDArray[np.float64], Literal["2D Array"]],
         nodes: dict[str, int],
         eps: float=1e-4,
         maxstep: int=1000
@@ -95,7 +95,7 @@ def CalculatePageRankFromAdjacencyMatrix_Python(
 
 
 def CalculatePageRankFromAdjacencyMatrix(
-        adjMatrix: NDArray[Shape["*, *"], Float],
+        adjMatrix: Annotated[NDArray[np.float64], Literal["2D Array"]],
         nodes: dict[str, int],
         eps: float=1e-4,
         maxstep: int=1000,