diff options
| author | André Nusser <andre.nusser@googlemail.com> | 2019-03-22 01:09:15 +0100 |
|---|---|---|
| committer | André Nusser <andre.nusser@googlemail.com> | 2019-05-11 14:58:45 +0200 |
| commit | 9c5efc23764522597a53a8745860cec54ea55d69 (patch) | |
| tree | d672afdf2e11553d36370cc1abbef5033557f85e /src/sample_selection.cc | |
| parent | 50b011c4740a5ec5338903b1d8b5fbb4b42f3df3 (diff) | |
Add settings and GUI for new sampling algorithm.
Diffstat (limited to 'src/sample_selection.cc')
| -rw-r--r-- | src/sample_selection.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sample_selection.cc b/src/sample_selection.cc index 6e956df..92c4efc 100644 --- a/src/sample_selection.cc +++ b/src/sample_selection.cc @@ -79,6 +79,7 @@ const Sample* SampleSelection::get(level_t level, std::size_t pos) } } +// FIXME: remove before release and adapt everything const Sample* SampleSelection::getOld(level_t level, std::size_t pos) { auto velocity_stddev = settings.velocity_stddev.load(); @@ -176,9 +177,9 @@ const Sample* SampleSelection::getObjective(level_t level, std::size_t pos) DEBUG(rand, "level: %f, lvl: %f (mean: %.2f, stddev: %.2f," "power_min: %f, power_max: %f)\n", level, lvl, mean, stddev, power_min, power_max); - const float f_distance = 2.0; - const float f_recent = 1.0; - const float f_random = .05; + const float f_distance = settings.sample_selection_f_distance.load(); + const float f_recent = settings.sample_selection_f_recent.load(); + const float f_random = settings.sample_selection_f_random.load(); // start with most promising power value and then stop when reaching far values // which cannot become opt anymore |