simdec 1.4.0__tar.gz → 1.5.0__tar.gz

{simdec-1.4.0 → simdec-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simdec
-Version: 1.4.0
+Version: 1.5.0
 Summary: Sensitivity analysis using simulation decomposition
 Project-URL: homepage, https://www.simdec.fi/
 Project-URL: documentation, https://simdec.readthedocs.io
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: salib
@@ -96,4 +96,4 @@ If you use SimDec in your research we would appreciate a citation to the
 following publications:
 
 - Kozlova, M., Moss, R. J., Yeomans, J. S., & Caers, J. (2024). Uncovering Heterogeneous Effects in Computational Models for Sustainable Decision-making. _Environmental Modelling & Software_, 171, 105898. [https://doi.org/10.1016/j.envsoft.2023.105898](https://doi.org/10.1016/j.envsoft.2023.105898)
-- Kozlova, M., Moss, R. J., Roy, P., Alam, A., & Yeomans, J. S. (2024). SimDec algorithm and guidelines for its usage and interpretation. In M. Kozlova & J. S. Yeomans (Eds.), _Sensitivity Analysis for Business, Technology, and Policymaking. Made Easy with Simulation Decomposition_. Routledge. [Available here](https://doi.org/10.4324/9781003453789-3).
+- Kozlova, M., Moss, R. J., Roy, P., Alam, A., & Yeomans, J. S. (2024). SimDec algorithm and guidelines for its usage and interpretation. In M. Kozlova & J. S. Yeomans (Eds.), _Sensitivity Analysis for Business, Technology, and Policymaking. Made Easy with Simulation Decomposition_. Routledge. [Available here](https://github.com/Simulation-Decomposition/SimDec-book/blob/74ce72c1d3dda650eba1c59e3b215a4bb35c6be0/chapters/02_SimDec_algorithm_and_instructions/Ch2.pdf).

{simdec-1.4.0 → simdec-1.5.0}/README.md

@@ -43,4 +43,4 @@ If you use SimDec in your research we would appreciate a citation to the
 following publications:
 
 - Kozlova, M., Moss, R. J., Yeomans, J. S., & Caers, J. (2024). Uncovering Heterogeneous Effects in Computational Models for Sustainable Decision-making. _Environmental Modelling & Software_, 171, 105898. [https://doi.org/10.1016/j.envsoft.2023.105898](https://doi.org/10.1016/j.envsoft.2023.105898)
-- Kozlova, M., Moss, R. J., Roy, P., Alam, A., & Yeomans, J. S. (2024). SimDec algorithm and guidelines for its usage and interpretation. In M. Kozlova & J. S. Yeomans (Eds.), _Sensitivity Analysis for Business, Technology, and Policymaking. Made Easy with Simulation Decomposition_. Routledge. [Available here](https://doi.org/10.4324/9781003453789-3).
+- Kozlova, M., Moss, R. J., Roy, P., Alam, A., & Yeomans, J. S. (2024). SimDec algorithm and guidelines for its usage and interpretation. In M. Kozlova & J. S. Yeomans (Eds.), _Sensitivity Analysis for Business, Technology, and Policymaking. Made Easy with Simulation Decomposition_. Routledge. [Available here](https://github.com/Simulation-Decomposition/SimDec-book/blob/74ce72c1d3dda650eba1c59e3b215a4bb35c6be0/chapters/02_SimDec_algorithm_and_instructions/Ch2.pdf).

{simdec-1.4.0 → simdec-1.5.0}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "hatchling.build"
 
 [project]
 name = "simdec"
-version = "1.4.0"
+version = "1.5.0"
 description = "Sensitivity analysis using simulation decomposition"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 license = "BSD-3-Clause"
 authors = [
     { name = "Pamphile Roy" },

{simdec-1.4.0 → simdec-1.5.0}/src/simdec/decomposition.py

@@ -166,13 +166,37 @@ def decomposition(
     # sort and then split in n-state
     sorted_inputs = np.sort(inputs, axis=0)
     bin_edges = []
+
     for i, states_ in enumerate(states):
+        col = inputs[:, i]
+        uniq = np.unique(col)
+
+        # Categorical-like numeric inputs: if we have few unique numeric values,
+        # build edges around the unique values so we don't create empty states.
+        # We only apply this when the requested number of states matches the
+        # number of categories (uniq.size).
+        if uniq.size <= 5 and states_ == uniq.size:
+            uniq = np.sort(uniq).astype(float)
+
+            if uniq.size == 1:
+                edges = np.array([uniq[0] - 0.5, uniq[0] + 0.5], dtype=float)
+            else:
+                gaps = np.diff(uniq)
+                margin = 0.1 * np.min(gaps)
+                edges = np.concatenate(
+                    ([uniq[0] - margin], uniq[:-1] + margin, [uniq[-1] + margin])
+                ).astype(float)
+
+            bin_edges.append(edges)
+            continue
+
+        # Default: equal-number-of-samples bins
         splits = np.array_split(sorted_inputs[:, i], states_)
-        bin_edges_ = [splits_[0] for splits_ in splits]
-        bin_edges_.append(splits[-1][-1])  # last point to close the edges
-        # bin_edges_ = np.unique(bin_edges_)  # remove duplicate points, sorted
-        bin_edges_ += 1e-10 * np.linspace(0, 1, len(bin_edges_))
-        bin_edges.append(bin_edges_)
+        edges = [s[0] for s in splits]
+        edges.append(splits[-1][-1])  # last point to close the edges
+        edges = np.array(edges, dtype=float)
+        edges += 1e-10 * np.linspace(0, 1, len(edges))
+        bin_edges.append(edges)
 
     res = stats.binned_statistic_dd(
         inputs, values=output, statistic=statistic_, bins=bin_edges