feat: use NumPy RNG for get_int(), get_real() and get_norm() as well

Author: ntamas

src/igraph_ctypes/_internal/rng.py

@@ -4,7 +4,12 @@
 from typing import Callable, Optional
 
 from .lib import igraph_rng_set_default
-from .types import igraph_rng_type_t, np_type_of_igraph_uint_t
+from .types import (
+    igraph_rng_type_t,
+    np_type_of_igraph_integer_t,
+    np_type_of_igraph_real_t,
+    np_type_of_igraph_uint_t,
+)
 from .wrappers import _RNG
 
 __all__ = ("NumPyRNG",)
@@ -32,6 +37,10 @@ def __init__(self, generator: Generator):
             destroy=igraph_rng_type_t.TYPES["destroy"](self._rng_destroy),
             seed=igraph_rng_type_t.TYPES["seed"](self._rng_seed),
             get=igraph_rng_type_t.TYPES["get"](self._rng_get),
+            get_int=igraph_rng_type_t.TYPES["get_int"](self._rng_get_int),
+            get_real=igraph_rng_type_t.TYPES["get_real"](self._rng_get_real),
+            get_norm=igraph_rng_type_t.TYPES["get_norm"](self._rng_get_norm),
+            # TODO(ntamas): get_geom, get_binom, get_exp, get_gamma, get_pois
         )
         self._rng = _RNG.create(pointer(self._rng_type))
         self._rng.unwrap().is_seeded = True
@@ -57,6 +66,17 @@ def _rng_get(self, _state):
             0, 0xFFFFFFFFFFFFFFFF, dtype=np_type_of_igraph_uint_t, endpoint=True
         )
 
+    def _rng_get_int(self, _state, lo, hi):
+        return self._generator.integers(
+            lo, hi, dtype=np_type_of_igraph_integer_t, endpoint=True
+        )
+
+    def _rng_get_real(self, _state):
+        return self._generator.random(dtype=np_type_of_igraph_real_t)
+
+    def _rng_get_norm(self, _state):
+        return self._generator.normal()
+
     def attach(self) -> Callable[[], None]:
         """Attaches this RNG instance as igraph's default RNG.
 

src/igraph_ctypes/_internal/types.py

@@ -365,6 +365,20 @@ class igraph_rng_type_t(Structure):
         "destroy": CFUNCTYPE(None, igraph_rng_state_t),
         "seed": CFUNCTYPE(igraph_error_t, igraph_rng_state_t, igraph_uint_t),
         "get": CFUNCTYPE(igraph_uint_t, igraph_rng_state_t),
+        "get_int": CFUNCTYPE(
+            igraph_integer_t, igraph_rng_state_t, igraph_integer_t, igraph_integer_t
+        ),
+        "get_real": CFUNCTYPE(igraph_real_t, igraph_rng_state_t),
+        "get_norm": CFUNCTYPE(igraph_real_t, igraph_rng_state_t),
+        "get_geom": CFUNCTYPE(igraph_real_t, igraph_rng_state_t, igraph_real_t),
+        "get_binom": CFUNCTYPE(
+            igraph_real_t, igraph_rng_state_t, igraph_integer_t, igraph_real_t
+        ),
+        "get_exp": CFUNCTYPE(igraph_real_t, igraph_rng_state_t, igraph_real_t),
+        "get_gamma": CFUNCTYPE(
+            igraph_real_t, igraph_rng_state_t, igraph_real_t, igraph_real_t
+        ),
+        "get_pois": CFUNCTYPE(igraph_real_t, igraph_rng_state_t, igraph_real_t),
     }
 
     _fields_ = [
@@ -374,27 +388,14 @@ class igraph_rng_type_t(Structure):
         ("destroy", TYPES["destroy"]),
         ("seed", TYPES["seed"]),
         ("get", TYPES["get"]),
-        (
-            "get_int",
-            CFUNCTYPE(
-                igraph_integer_t, igraph_rng_state_t, igraph_integer_t, igraph_integer_t
-            ),
-        ),
-        ("get_real", CFUNCTYPE(igraph_real_t, igraph_rng_state_t)),
-        ("get_norm", CFUNCTYPE(igraph_real_t, igraph_rng_state_t)),
-        ("get_geom", CFUNCTYPE(igraph_real_t, igraph_rng_state_t, igraph_real_t)),
-        (
-            "get_binom",
-            CFUNCTYPE(
-                igraph_real_t, igraph_rng_state_t, igraph_integer_t, igraph_real_t
-            ),
-        ),
-        ("get_exp", CFUNCTYPE(igraph_real_t, igraph_rng_state_t, igraph_real_t)),
-        (
-            "get_gamma",
-            CFUNCTYPE(igraph_real_t, igraph_rng_state_t, igraph_real_t, igraph_real_t),
-        ),
-        ("get_pois", CFUNCTYPE(igraph_real_t, igraph_rng_state_t, igraph_real_t)),
+        ("get_int", TYPES["get_int"]),
+        ("get_real", TYPES["get_real"]),
+        ("get_norm", TYPES["get_norm"]),
+        ("get_geom", TYPES["get_geom"]),
+        ("get_binom", TYPES["get_binom"]),
+        ("get_exp", TYPES["get_exp"]),
+        ("get_gamma", TYPES["get_gamma"]),
+        ("get_pois", TYPES["get_pois"]),
     ]