Merge branch 'develop' into gh1035_problem_startpoint

ICB-DCM · Jul 12, 2023 · f8351ba · f8351ba
2 parents 3d7fbff + daf47dd
commit f8351ba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/pypesto/C.py b/pypesto/C.py
@@ -312,6 +312,9 @@ class InnerParameterType(str, Enum):
 ALL_CLUSTERED = 'all_clustered'  # best + all that are in a cluster of size > 1
 FIRST_CLUSTER = 'first_cluster'  # all starts that belong to the first cluster
 
+# waterfall max value
+WATERFALL_MAX_VALUE = 1e100
+
 
 ###############################################################################
 # ENVIRONMENT VARIABLES

diff --git a/pypesto/visualize/parameters.py b/pypesto/visualize/parameters.py
@@ -10,7 +10,7 @@
 
 from pypesto.util import delete_nan_inf
 
-from ..C import RGBA
+from ..C import RGBA, WATERFALL_MAX_VALUE
 from ..result import Result
 from .clust_color import assign_colors
 from .misc import (
@@ -276,7 +276,7 @@ def parameters_lowlevel(
         fvals=fvals,
         x=xs,
         xdim=len(ub) if ub is not None else 1,
-        magnitude_bound=1e100,
+        magnitude_bound=WATERFALL_MAX_VALUE,
     )
 
     if size is None:

diff --git a/pypesto/visualize/waterfall.py b/pypesto/visualize/waterfall.py
@@ -7,6 +7,7 @@
 
 from pypesto.util import delete_nan_inf
 
+from ..C import WATERFALL_MAX_VALUE
 from ..result import Result
 from .clust_color import RGBA, assign_colors
 from .misc import (
@@ -121,7 +122,9 @@ def waterfall(
         # parse input
         if order_by_id:
             start_ids = [s.id for s in results[j].optimize_result.list]
-            fvals_raw_is_finite = np.isfinite(fvals_raw)
+            fvals_raw_is_finite = np.isfinite(fvals_raw) & (
+                np.absolute(fvals_raw) < WATERFALL_MAX_VALUE
+            )
 
             fvals = []
             for start_id in start_id_ordering:
@@ -135,7 +138,9 @@ def waterfall(
             # also remove extremely large values. These values result in `inf`
             # values in the output of `scipy.cluster.hierarchy.linkage` in the
             # method `pypesto.util.assign_clusters`, which raises errors.
-            _, fvals = delete_nan_inf(fvals=fvals_raw, magnitude_bound=1e100)
+            _, fvals = delete_nan_inf(
+                fvals=fvals_raw, magnitude_bound=WATERFALL_MAX_VALUE
+            )
             fvals.sort()
 
         # assign colors