Skip to content

Commit 1fc1055

Browse files
committed
Update unclear formulation
1 parent 27ac7ab commit 1fc1055

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

climada/engine/unsequa/input_var.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def haz(haz_list, n_ev=None, bounds_int=None, bounds_frac=None, bounds_freq=None
246246
The frequency of all events is multiplied by a number
247247
sampled uniformly from a distribution with (min, max) = bounds_freq
248248
HL: sample uniformly from hazard list
249-
Uniformly sample one element from the provided list of hazards.
249+
For each sample, one element is drawn uniformly from the provided list of hazards.
250250
For example, Hazards outputs from dynamical models for different input factors.
251251
252252
If a bounds is None, this parameter is assumed to have no uncertainty.
@@ -309,7 +309,7 @@ def exp(exp_list, bounds_totval=None, bounds_noise=None):
309309
with (min, max) = bounds_noise. EN is the value of the seed
310310
for the uniform random number generator.
311311
EL: sample uniformly from exposure list
312-
Uniformly sample one element from the provided list of exposures.
312+
For each sample, one element is drawn uniformly from the provided list of exposures.
313313
For example, LitPop instances with different exponents.
314314
315315
If a bounds is None, this parameter is assumed to have no uncertainty.
@@ -375,7 +375,7 @@ def impfset(
375375
sampled uniformly from a distribution with
376376
(min, max) = bounds_int
377377
IL: sample uniformly from impact function set list
378-
Uniformly sample one element from the provided list of impact function sets.
378+
For each sample, one element is drawn uniformly from the provided list of impact function sets.
379379
For example, impact functions obtained from different calibration methods.
380380
381381
@@ -466,7 +466,7 @@ def ent(
466466
with (min, max) = bounds_noise. EN is the value of the seed
467467
for the uniform random number generator.
468468
EL: sample uniformly from exposure list
469-
Uniformly sample one element from the provided list of exposures.
469+
For each sample, one element is drawn uniformly from the provided list of exposures.
470470
For example, LitPop instances with different exponents.
471471
MDD: scale the mdd (homogeneously)
472472
The value of mdd at each intensity is multiplied by a number
@@ -481,7 +481,7 @@ def ent(
481481
sampled uniformly from a distribution with
482482
(min, max) = bounds_int
483483
IL: sample uniformly from impact function set list
484-
Uniformly sample one element from the provided list of impact function sets.
484+
For each sample, one element is drawn uniformly from the provided list of impact function sets.
485485
For example, impact functions obtained from different calibration methods.
486486
487487
If a bounds is None, this parameter is assumed to have no uncertainty.
@@ -613,7 +613,7 @@ def entfut(
613613
with (min, max) = bounds_noise. EN is the value of the seed
614614
for the uniform random number generator.
615615
EL: sample uniformly from exposure list
616-
Uniformly sample one element from the provided list of exposures.
616+
For each sample, one element is drawn uniformly from the provided list of exposures.
617617
For example, LitPop instances with different exponents.
618618
MDD: scale the mdd (homogeneously)
619619
The value of mdd at each intensity is multiplied by a number
@@ -628,7 +628,7 @@ def entfut(
628628
sampled uniformly from a distribution with
629629
(min, max) = bounds_impfi
630630
IL: sample uniformly from impact function set list
631-
Uniformly sample one element from the provided list of impact function sets.
631+
For each sample, one element is drawn uniformly from the provided list of impact function sets.
632632
For example, impact functions obtained from different calibration methods.
633633
634634
If a bounds is None, this parameter is assumed to have no uncertainty.

doc/user-guide/climada_engine_unsequa_helper.ipynb

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@
6767
"- EN: mutliplicative noise (inhomogeneous)\n",
6868
"> The value of each exposure point is independently multiplied by a random number sampled uniformly from a distribution with (min, max) = bounds_noise. EN is the value of the seed for the uniform random number generator.\n",
6969
"- EL: sample uniformly from exposure list\n",
70-
"> Uniformly sample one element from the provided list of exposures. For example, LitPop instances with different exponents.\n",
71-
"\n",
70+
"> For each sample, one element is drawn uniformly from the provided list of exposures. For example, LitPop instances with different exponents.\n",
7271
"\n",
7372
"If a bounds is None, this parameter is assumed to have no uncertainty."
7473
]
@@ -1153,8 +1152,7 @@
11531152
"- IFi: shift the intensity (homogeneously)\n",
11541153
"> The value intensity are all summed with a random number sampled uniformly from a distribution with (min, max) = bounds_int\n",
11551154
"- IL: sample uniformly from impact function set list\n",
1156-
"> Uniformly sample one element from the provided list of impact function sets. For example, impact functions obtained from different calibration methods.\n",
1157-
"\n",
1155+
"> For each sample, one element is drawn uniformly from the provided list of impact function sets. For example, impact functions obtained from different calibration methods.\n",
11581156
"\n",
11591157
"If a bounds is None, this parameter is assumed to have no uncertainty."
11601158
]
@@ -1268,15 +1266,15 @@
12681266
"- EN: mutliplicative noise (inhomogeneous)\n",
12691267
"> The value of each exposure point is independently multiplied by a random number sampled uniformly from a distribution with (min, max) = bounds_noise. EN is the value of the seed for the uniform random number generator.\n",
12701268
"- EL: sample uniformly from exposure list\n",
1271-
"> Uniformly sample one element from the provided list of exposures. For example, LitPop instances with different exponents.\n",
1269+
"> For each sample, one element is drawn uniformly from the provided list of exposures. For example, LitPop instances with different exponents.\n",
12721270
"- MDD: scale the mdd (homogeneously)\n",
12731271
"> The value of mdd at each intensity is multiplied by a number sampled uniformly from a distribution with (min, max) = bounds_mdd\n",
12741272
"- PAA: scale the paa (homogeneously)\n",
12751273
"> The value of paa at each intensity is multiplied by a number sampled uniformly from a distribution with (min, max) = bounds_paa\n",
12761274
"- IFi: shift the intensity (homogeneously)\n",
12771275
"> The value intensity are all summed with a random number sampled uniformly from a distribution with (min, max) = bounds_int\n",
12781276
"- IL: sample uniformly from impact function set list\n",
1279-
"> Uniformly sample one element from the provided list of impact function sets. For example, impact functions obtained from different calibration methods.\n",
1277+
"> For each sample, one element is drawn uniformly from the provided list of impact function sets. For example, impact functions obtained from different calibration methods.\n",
12801278
"\n",
12811279
"\n",
12821280
"If a bounds is None, this parameter is assumed to have no uncertainty."
@@ -1821,16 +1819,15 @@
18211819
"- EN: mutliplicative noise (inhomogeneous)\n",
18221820
"> The value of each exposure point is independently multiplied by a random number sampled uniformly from a distribution with (min, max) = bounds_noise. EN is the value of the seed for the uniform random number generator.\n",
18231821
"- EL: sample uniformly from exposure list\n",
1824-
"> Uniformly sample one element from the provided list of exposures. For example, LitPop instances with different exponents.\n",
1822+
"> For each sample, one element is drawn uniformly from the provided list of exposures. For example, LitPop instances with different exponents.\n",
18251823
"- MDD: scale the mdd (homogeneously)\n",
18261824
"> The value of mdd at each intensity is multiplied by a number sampled uniformly from a distribution with (min, max) = bounds_mdd\n",
18271825
"- PAA: scale the paa (homogeneously)\n",
18281826
"> The value of paa at each intensity is multiplied by a number sampled uniformly from a distribution with (min, max) = bounds_paa\n",
18291827
"- IFi: shift the impact function intensity (homogeneously)\n",
18301828
"> The value intensity are all summed with a random number sampled uniformly from a distribution with (min, max) = bounds_impfi\n",
18311829
"- IL: sample uniformly from impact function set list\n",
1832-
"> Uniformly sample one element from the provided list of impact function sets. For example, impact functions obtained from different calibration methods.\n",
1833-
"\n",
1830+
"> For each sample, one element is drawn uniformly from the provided list of impact function sets. For example, impact functions obtained from different calibration methods.\n",
18341831
"\n",
18351832
"If a bounds is None, this parameter is assumed to have no uncertainty."
18361833
]

0 commit comments

Comments
 (0)