modelbase2 0.2.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

modelbase2/__init__.py

@@ -53,6 +53,7 @@ __all__ = [
     "make_protocol",
     "mc",
     "mca",
+    "nnarchitectures",
     "plot",
     "sbml",
     "steady_state",
@@ -70,7 +71,17 @@ import pandas as pd
 if TYPE_CHECKING:
     from modelbase2.types import ArrayLike
 
-from . import distributions, experimental, fit, mc, mca, plot, sbml, surrogates
+from . import (
+    distributions,
+    experimental,
+    fit,
+    mc,
+    mca,
+    nnarchitectures,
+    plot,
+    sbml,
+    surrogates,
+)
 from .integrators import DefaultIntegrator, Scipy
 from .label_map import LabelMapper
 from .linear_label_map import LinearLabelMapper

modelbase2/distributions.py

@@ -7,6 +7,7 @@ Classes:
     Distribution (Protocol): Base protocol for all distribution classes
     Beta: Beta distribution for parameters bounded between 0 and 1
     Uniform: Uniform distribution for parameters with simple bounds
+    LogUniform: LogUniform distribution for parameters with simple bounds
     Normal: Normal (Gaussian) distribution for unbounded parameters
     LogNormal: Log-normal distribution for strictly positive parameters
     Skewnorm: Skewed normal distribution for asymmetric parameter distributions
@@ -35,6 +36,7 @@ __all__ = [
     "Distribution",
     "GaussianKde",
     "LogNormal",
+    "LogUniform",
     "Normal",
     "RNG",
     "Skewnorm",
@@ -121,6 +123,37 @@ class Uniform:
         return rng.uniform(self.lower_bound, self.upper_bound, num)
 
 
+@dataclass
+class LogUniform:
+    """LogUniform distribution for parameters with simple bounds.
+
+    Args:
+        lower_bound: Minimum value
+        upper_bound: Maximum value
+
+    """
+
+    lower_bound: float
+    upper_bound: float
+
+    def sample(self, num: int, rng: np.random.Generator | None = None) -> Array:
+        """Generate random samples from the loguniform distribution.
+
+        Args:
+            num: Number of samples to generate
+            rng: Random number generator
+
+        """
+        if rng is None:
+            rng = RNG
+        return cast(
+            Array,
+            stats.loguniform.rvs(
+                self.lower_bound, self.upper_bound, size=num, random_state=rng
+            ),
+        )
+
+
 @dataclass
 class Normal:
     """Normal (Gaussian) distribution for unbounded parameters.

modelbase2/experimental/__init__.py

@@ -7,11 +7,13 @@ from __future__ import annotations
 
 from .codegen import generate_model_code_py, generate_modelbase_code
 from .diff import model_diff
+from .symbolic import model_fn_to_sympy
 from .tex import to_tex
 
 __all__ = [
     "generate_model_code_py",
     "generate_modelbase_code",
     "model_diff",
+    "model_fn_to_sympy",
     "to_tex",
 ]