pyelq 1.1.0__tar.gz → 1.1.2__tar.gz

{pyelq-1.1.0 → pyelq-1.1.2}/PKG-INFO

@@ -1,19 +1,21 @@
 Metadata-Version: 2.3
 Name: pyelq
-Version: 1.1.0
+Version: 1.1.2
 Summary: Package for detection, localization and quantification code.
 License: Apache-2.0
 Keywords: gas dispersion,emission,detection,localization,quantification
 Author: Bas van de Kerkhof
-Requires-Python: >=3.9,<3.12
+Requires-Python: >=3.9
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: geojson (>=3.2.0)
 Requires-Dist: numpy (>=2.0.2)
-Requires-Dist: openmcmc (==1.0.5)
+Requires-Dist: openmcmc (==1.0.6)
 Requires-Dist: pandas (>=2.2.3)
 Requires-Dist: plotly (>=6.0.0)
 Requires-Dist: pymap3d (>=3.1.0)

{pyelq-1.1.0 → pyelq-1.1.2}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pyelq"
-version = "1.1.0"
+version = "1.1.2"
 description = "Package for detection, localization and quantification code."
 authors = ["Bas van de Kerkhof", "Matthew Jones", "David Randell"]
 homepage = "https://sede-open.github.io/pyELQ/"
@@ -20,7 +20,7 @@ keywords = ["gas dispersion", "emission", "detection", "localization", "quantifi
 packages = [{ include = "pyelq", from = "src" }]
 
 [tool.poetry.dependencies]
-python = ">=3.9, <3.12"
+python = ">=3.9"
 pandas = ">=2.2.3"
 numpy = ">=2.0.2"
 plotly = ">=6.0.0"
@@ -29,7 +29,7 @@ pymap3d = ">=3.1.0"
 geojson = ">=3.2.0"
 shapely = ">=2.0.7"
 scikit-learn = ">=1.6.1"
-openmcmc = "==1.0.5"
+openmcmc = "==1.0.6"
 
 [tool.poetry.group.contributor]
 optional = true
@@ -67,7 +67,7 @@ py-version=3.11
 
 [tool.black]
 line-length = 120
-target-version = ['py39', 'py310', 'py311']
+target-version = ['py311']
 
 [tool.pydocstyle]
 convention = "google"

{pyelq-1.1.0 → pyelq-1.1.2}/src/pyelq/dlm.py

@@ -119,20 +119,22 @@ class DLM:
         mean_state_noise = np.zeros(self.nof_state_parameters)
         mean_observation_noise = np.zeros(self.nof_observables)
 
+        random_generator = np.random.default_rng(seed=None)
+
         for i in range(nof_timesteps):
             if i == 0:
                 state[:, [i]] = (
                     self.g_matrix @ init_state
-                    + np.random.multivariate_normal(mean_state_noise, self.w_matrix, size=1).T
+                    + random_generator.multivariate_normal(mean_state_noise, self.w_matrix, size=1).T
                 )
             else:
                 state[:, [i]] = (
                     self.g_matrix @ state[:, [i - 1]]
-                    + np.random.multivariate_normal(mean_state_noise, self.w_matrix, size=1).T
+                    + random_generator.multivariate_normal(mean_state_noise, self.w_matrix, size=1).T
                 )
             obs[:, [i]] = (
                 self.f_matrix.T @ state[:, [i]]
-                + np.random.multivariate_normal(mean_observation_noise, self.v_matrix, size=1).T
+                + random_generator.multivariate_normal(mean_observation_noise, self.v_matrix, size=1).T
             )
 
         return state, obs

{pyelq-1.1.0 → pyelq-1.1.2}/src/pyelq/gas_species.py

@@ -230,3 +230,25 @@ class NO2(GasSpecies):
 
     global_background = 0
     half_life = 12
+
+
+@dataclass
+class H2(GasSpecies):
+    """Defines the properties of H2."""
+
+    @property
+    def name(self):
+        """Str: Name of gas."""
+        return "Hydrogen"
+
+    @property
+    def molar_mass(self):
+        """Float: Molar Mass [g/mol]."""
+        return 2.01568
+
+    @property
+    def formula(self):
+        """Str: Chemical formula of gas."""
+        return "H2"
+
+    global_background = 0.5

{pyelq-1.1.0 → pyelq-1.1.2}/src/pyelq/plotting/plot.py

@@ -38,6 +38,9 @@ from pyelq.support_functions.post_processing import (
 if TYPE_CHECKING:
     from pyelq.model import ELQModel
 
+RGB_LIGHT_BLUE = "rgb(102, 197, 204)"
+MCMC_ITERATION_NUMBER_LITERAL = "MCMC Iteration Number"
+
 
 def lighter_rgb(rbg_string: str) -> str:
     """Takes in an RGB string and returns a lighter version of this colour.
@@ -162,7 +165,7 @@ def create_trace_specifics(object_to_plot: Union[Type[SlabAndSpike], SourceModel
     if isinstance(object_to_plot, SourceModel):
         dict_key = kwargs.pop("dict_key", "number_of_sources_plot")
         title_text = "Number of Sources 'on' against MCMC iterations"
-        x_label = "MCMC Iteration Number"
+        x_label = MCMC_ITERATION_NUMBER_LITERAL
         y_label = "Number of Sources 'on'"
         emission_rates = object_to_plot.emission_rate
         if isinstance(object_to_plot, SlabAndSpike):
@@ -179,11 +182,11 @@ def create_trace_specifics(object_to_plot: Union[Type[SlabAndSpike], SourceModel
     elif isinstance(object_to_plot, MCMC):
         dict_key = kwargs.pop("dict_key", "log_posterior_plot")
         title_text = "Log posterior values against MCMC iterations"
-        x_label = "MCMC Iteration Number"
+        x_label = MCMC_ITERATION_NUMBER_LITERAL
         y_label = "Log Posterior<br>Value"
         y_values = object_to_plot.store["log_post"].flatten()
         x_values = np.array(range(y_values.size))
-        color = "rgb(102, 197, 204)"
+        color = RGB_LIGHT_BLUE
         name = "Log Posterior"
 
         if "burn_in" not in kwargs:
@@ -245,7 +248,7 @@ def create_plot_specifics(
         if plot_type == "line":
             dict_key = kwargs.pop("dict_key", "error_model_iterations")
             title_text = "Estimated Error Model Values"
-            x_label = "MCMC Iteration Number"
+            x_label = MCMC_ITERATION_NUMBER_LITERAL
             y_label = "Estimated Error Model<br>Standard Deviation (ppm)"
 
         elif plot_type == "box":
@@ -270,7 +273,7 @@ def create_plot_specifics(
         if plot_type == "line":
             dict_key = kwargs.pop("dict_key", "offset_iterations")
             title_text = f"Estimated Value of Offset w.r.t. {offset_sensor_name}"
-            x_label = "MCMC Iteration Number"
+            x_label = MCMC_ITERATION_NUMBER_LITERAL
             y_label = "Estimated Offset<br>Value (ppm)"
 
         elif plot_type == "box":
@@ -816,7 +819,7 @@ class Plot:
 
         dict_key = "estimated_values_plot"
         title_text = "Estimated Values of Sources With Respect to MCMC Iterations"
-        x_label = "MCMC Iteration Number"
+        x_label = MCMC_ITERATION_NUMBER_LITERAL
         y_label = "Estimated Emission<br>Values (kg/hr)"
 
         fig = go.Figure()
@@ -838,7 +841,7 @@ class Plot:
                 fig=fig,
                 x_values=x_values,
                 y_values=y_values,
-                color="rgb(102, 197, 204)",
+                color=RGB_LIGHT_BLUE,
                 name=f"Source {source_idx}",
                 burn_in=burn_in,
                 show_legend=False,
@@ -849,7 +852,7 @@ class Plot:
             fig=fig,
             x_values=np.array([None]),
             y_values=np.array([None]),
-            color="rgb(102, 197, 204)",
+            color=RGB_LIGHT_BLUE,
             name="Source traces",
             burn_in=0,
             show_legend=True,