More transf II.

Author: xjules

src/ert/config/scalar_parameter.py

@@ -1,10 +1,10 @@
+import math
 import warnings
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Literal
 
 import numpy as np
-import xarray as xr
 from scipy.stats import norm
 
 from .parameter_config import ParameterConfig
@@ -13,8 +13,8 @@
 
 
 @dataclass
-class TransUniformSettings:
-    name: Literal["uniform"] = "uniform"
+class TransUnifSettings:
+    name: Literal["unif"] = "unif"
     min: float = 0.0
     max: float = 1.0
 
@@ -23,6 +23,20 @@ def trans(self, x: float) -> float:
         return y * (self.max - self.min) + self.min
 
 
+@dataclass
+class TransDUnifSettings:
+    name: Literal["dunif"] = "dunif"
+    steps: int = 1000
+    min: float = 0.0
+    max: float = 1.0
+
+    def trans(self, x: float) -> float:
+        y = float(norm.cdf(x))
+        return (math.floor(y * self.steps) / (self.steps - 1)) * (
+            self.max - self.min
+        ) + self.min
+
+
 @dataclass
 class TransNormalSettings:
     name: Literal["normal"] = "normal"
@@ -33,6 +47,19 @@ def trans(self, x: float) -> float:
         return x * self.std + self.mean
 
 
+@dataclass
+class TransTruncNormalSettings:
+    name: Literal["trunc_normal"] = "trunc_normal"
+    mean: float = 0.0
+    std: float = 1.0
+    min: float = 0.0
+    max: float = 1.0
+
+    def trans(self, x: float) -> float:
+        y = x * self.std + self.mean
+        return max(min(y, self.max), self.min)  # clamp
+
+
 @dataclass
 class TransRawSettings:
     name: Literal["raw"] = "raw"
@@ -50,6 +77,25 @@ def trans(self, _: float) -> float:
         return self.value
 
 
+@dataclass
+class TransTriangularSettings:
+    name: Literal["triangular"] = "triangular"
+    min: float = 0.0
+    mode: float = 0.5
+    max: float = 1.0
+
+    def trans(self, x: float) -> float:
+        inv_norm_left = (self.max - self.min) * (self.mode - self.min)
+        inv_norm_right = (self.max - self.min) * (self.max - self.mode)
+        ymode = (self.mode - self.min) / (self.max - self.min)
+        y = norm.cdf(x)
+
+        if y < ymode:
+            return self.min + math.sqrt(y * inv_norm_left)
+        else:
+            return self.max - math.sqrt((1 - y) * inv_norm_right)
+
+
 @dataclass
 class TransErrfSettings:
     name: Literal["errf"] = "errf"
@@ -105,16 +151,19 @@ class PolarsData:
 
 @dataclass
 class ScalarParameter(ParameterConfig):
-    name: str
+    # name: str
     group: str
     distribution: (
-        TransUniformSettings
+        TransUnifSettings
+        | TransDUnifSettings
         | TransRawSettings
         | TransConstSettings
         | TransNormalSettings
+        | TransTruncNormalSettings
         | TransErrfSettings
         | TransDerrfSettings
+        | TransTriangularSettings
     )
     active: bool
     input_source: Literal["design_matrix", "sampled"]
-    dataset_file: PolarsData | xr.Dataset
+    dataset_file: PolarsData