Merge branch 'master' into bugfixes

quaquel · web-flow · commit d16100e0bcd6 · 2023-04-19T13:25:58.000+02:00
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -65,7 +65,7 @@
 
 # General information about the project.
 project = "ema_workbench"
-copyright = "2011-2022, J.H. Kwakkel"
+copyright = "2011-2023, J.H. Kwakkel"
 
 
 # The version info for the project you're documenting, acts as replacement for
diff --git a/ema_workbench/em_framework/parameters.py b/ema_workbench/em_framework/parameters.py
@@ -211,6 +211,9 @@ class RealParameter(Parameter):
     upper_bound : int or float
     resolution : iterable
     variable_name : str, or list of str
+    pff : bool
+          if true, sample over this parameter using resolution in case of
+          partial factorial sampling
 
     Raises
     ------
@@ -250,6 +253,16 @@ def from_dist(cls, name, dist, **kwargs):
             raise ValueError("dist should be instance of rv_continouos")
         return super().from_dist(name, dist, **kwargs)
 
+    def __repr__(self):
+        if isinstance(self.dist, sp.stats._distn_infrastructure.rv_continuous_frozen):
+            return (
+                f"RealParameter('{self.name}', {self.lower_bound}, {self.upper_bound}, "
+                f"resolution={self.resolution}, default={self.default}, variable_name={self.variable_name}, "
+                f"pff={self.pff})"
+            )
+        else:
+            return super().__repr__()
+
 
 class IntegerParameter(Parameter):
     """integer valued model input parameter
@@ -261,6 +274,9 @@ class IntegerParameter(Parameter):
     upper_bound : int
     resolution : iterable
     variable_name : str, or list of str
+    pff : bool
+          if true, sample over this parameter using resolution in case of
+          partial factorial sampling
 
     Raises
     ------
@@ -321,6 +337,16 @@ def from_dist(cls, name, dist, **kwargs):
             raise ValueError("dist should be instance of rv_discrete")
         return super().from_dist(name, dist, **kwargs)
 
+    def __repr__(self):
+        if isinstance(self.dist, sp.stats._distn_infrastructure.rv_discrete_frozen):
+            return (
+                f"IntegerParameter('{self.name}', {self.lower_bound}, {self.upper_bound}, "
+                f"resolution={self.resolution}, default={self.default}, variable_name={self.variable_name}, "
+                f"pff={self.pff})"
+            )
+        else:
+            return super().__repr__()
+
 
 class CategoricalParameter(IntegerParameter):
     """categorical model input parameter
@@ -441,6 +467,12 @@ def __init__(self, name, default=None, variable_name=None, pff=False):
             name, categories=[True, False], default=default, variable_name=variable_name, pff=pff
         )
 
+    def __repr__(self):
+        return (
+            f"BooleanParameter('{self.name}', default={self.default}, "
+            f"variable_name={self.variable_name}, pff={self.pff})"
+        )
+
 
 def parameters_to_csv(parameters, file_name):
     """Helper function for writing a collection of parameters to a csv file
