Update: interface simplification

Author: heptaflar

kaleidoscope/generators.py

@@ -12,7 +12,6 @@
 from .interface.generating import Generating
 from .interface.generating import Normal
 from .interface.generating import Uniform
-from .interface.generating import Univariate
 
 
 def default_bit_generator(
@@ -68,15 +67,12 @@ class DefaultUniform(Uniform):
 
     def __init__(self, seed: int | np.ndarray | BitGenerator | None = None):
         """
-        Creates a new random variate.
+        Creates a new random deviate.
 
         :param seed: The seed.
         """
         self._g = default_generator(seed)
 
-    def get(self, i: int) -> Univariate:
-        return self
-
     def random(self) -> float:
         return self._g.random()
 
@@ -92,15 +88,12 @@ class DefaultNormal(Normal):
 
     def __init__(self, seed: int | np.ndarray | BitGenerator | None = None):
         """
-        Creates a new random variate.
+        Creates a new random deviate.
 
         :param seed: The seed.
         """
         self._g = default_generator(seed)
 
-    def get(self, i: int) -> Univariate:
-        return self
-
     def random(self) -> float:
         return self._g.standard_normal()
 

kaleidoscope/interface/generating.py

@@ -26,8 +26,8 @@ def next(self) -> int:
         """
 
 
-class Univariate(ABC):
-    """Univariate random deviates."""
+class Deviate(ABC):
+    """Random deviates."""
 
     @abstractmethod
     def random(self) -> float:
@@ -47,28 +47,15 @@ def randoms(self, randoms: np.ndarray) -> np.ndarray:
         """
 
 
-class Multivariate(ABC):
-    """Multivariate random deviates."""
-
-    @abstractmethod
-    def get(self, i: int) -> Univariate:
-        """
-        Returns a univariate random variate for a given dimension.
-
-        :param i: The dimension.
-        :return: The univariate random variate for the given dimension.
-        """
-
-
-class Normal(Univariate, Multivariate, ABC):
+class Normal(Deviate, ABC):
     """
     Normal random deviates.
 
     Generated random numbers are standard normally distributed.
     """
 
 
-class Uniform(Univariate, Multivariate, ABC):
+class Uniform(Deviate, ABC):
     """
     Uniform random deviates.