summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Nusser <andre.nusser@googlemail.com>2019-07-20 20:42:37 +0200
committerAndré Nusser <andre.nusser@googlemail.com>2019-07-20 20:42:37 +0200
commit2fd222f5f950fd791e7344b2e667fedc7dbbecc1 (patch)
treed5b8e85cd0488d0584da1dc15f39a35f6ba83b6b
parent5cfe39aa82ce25895517fb16e5fb7856181dd6ca (diff)
Again adapt standard settings for sample selection.
-rw-r--r--src/sample_selection.cc6
-rw-r--r--src/settings.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/sample_selection.cc b/src/sample_selection.cc
index 6fe4b63..2e08e9b 100644
--- a/src/sample_selection.cc
+++ b/src/sample_selection.cc
@@ -70,10 +70,10 @@ const Sample* SampleSelection::get(level_t level, std::size_t pos)
float close_opt = 0.;
float diverse_opt = 0.;
- // Note the magic value of "4" in front of f_close
+ // Note the magic values in front of the settings factors.
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();
+ const float f_diverse = (1./2.)*settings.sample_selection_f_diverse.load();
+ const float f_random = (1./3.)*settings.sample_selection_f_random.load();
float const power_range = powerlist.getMaxPower() - powerlist.getMinPower();
diff --git a/src/settings.h b/src/settings.h
index b967f91..64d27b7 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -76,8 +76,8 @@ struct Settings
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 = .5f;
- static float constexpr sample_selection_f_diverse_default = .1f;
- static float constexpr sample_selection_f_random_default = 0.03f;
+ static float constexpr sample_selection_f_diverse_default = .2f;
+ static float constexpr sample_selection_f_random_default = .1f;
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};