diff options
| author | André Nusser <andre.nusser@googlemail.com> | 2019-07-20 12:18:40 +0200 |
|---|---|---|
| committer | André Nusser <andre.nusser@googlemail.com> | 2019-07-20 12:19:22 +0200 |
| commit | 5cfe39aa82ce25895517fb16e5fb7856181dd6ca (patch) | |
| tree | 4a73dba4ee76798e5fd8d60166cf2765cc1afc72 /src | |
| parent | 932104c55a88ad788a8ab43ac15bc5ac23b34f34 (diff) | |
Set new default values for sample selection alg and scale parameters.
The parameters are now all in [0,1].
Diffstat (limited to 'src')
| -rw-r--r-- | src/sample_selection.cc | 3 | ||||
| -rw-r--r-- | src/settings.h | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/sample_selection.cc b/src/sample_selection.cc index f991e4b..6fe4b63 100644 --- a/src/sample_selection.cc +++ b/src/sample_selection.cc @@ -70,7 +70,8 @@ const Sample* SampleSelection::get(level_t level, std::size_t pos) float close_opt = 0.; float diverse_opt = 0.; - const float f_close = settings.sample_selection_f_close.load(); + // Note the magic value of "4" in front of f_close + const float f_close = 4.*settings.sample_selection_f_close.load(); const float f_diverse = settings.sample_selection_f_diverse.load(); const float f_random = settings.sample_selection_f_random.load(); diff --git a/src/settings.h b/src/settings.h index 84add97..b967f91 100644 --- a/src/settings.h +++ b/src/settings.h @@ -75,9 +75,9 @@ struct Settings static float constexpr velocity_modifier_falloff_default = 0.5f; static float constexpr velocity_modifier_weight_default = 0.25f; static float constexpr velocity_stddev_default = 1.0f; - static float constexpr sample_selection_f_close_default = 2.f; - static float constexpr sample_selection_f_diverse_default = .2f; - static float constexpr sample_selection_f_random_default = 0.1f; + static float constexpr sample_selection_f_close_default = .5f; + static float constexpr sample_selection_f_diverse_default = .1f; + static float constexpr sample_selection_f_random_default = 0.03f; Atomic<float> velocity_modifier_falloff{velocity_modifier_falloff_default}; Atomic<float> velocity_modifier_weight{velocity_modifier_weight_default}; Atomic<float> velocity_stddev{velocity_stddev_default}; |