diff options
| -rw-r--r-- | plugingui/sampleselectionframecontent.h | 6 | ||||
| -rw-r--r-- | src/sample_selection.cc | 19 | ||||
| -rw-r--r-- | src/settings.h | 6 |
3 files changed, 19 insertions, 12 deletions
diff --git a/plugingui/sampleselectionframecontent.h b/plugingui/sampleselectionframecontent.h index ebb1a02..67da213 100644 --- a/plugingui/sampleselectionframecontent.h +++ b/plugingui/sampleselectionframecontent.h @@ -46,9 +46,9 @@ public: SettingsNotifier& settings_notifier); private: - static float constexpr f_close_factor = 16.f; - static float constexpr f_diverse_factor = .5f; - static float constexpr f_random_factor = .5f; + static float constexpr f_close_factor = 4.f; + static float constexpr f_diverse_factor = 1.f; + static float constexpr f_random_factor = 1.f; void fCloseKnobValueChanged(float value); void fDiverseKnobValueChanged(float value); diff --git a/src/sample_selection.cc b/src/sample_selection.cc index fafeda4..03453f3 100644 --- a/src/sample_selection.cc +++ b/src/sample_selection.cc @@ -74,19 +74,26 @@ const Sample* SampleSelection::get(level_t level, std::size_t pos) const float f_diverse = settings.sample_selection_f_diverse.load(); const float f_random = settings.sample_selection_f_random.load(); + float const power_range = powerlist.getMaxPower() - powerlist.getMinPower(); + // start with most promising power value and then stop when reaching far values // which cannot become opt anymore auto closest_it = std::lower_bound(samples.begin(), samples.end(), level); std::size_t up_index = std::distance(samples.begin(), closest_it); std::size_t down_index = (up_index == 0 ? 0 : up_index - 1); - float up_value_lb = (up_index < samples.size() ? f_close*pow2(samples[up_index].power-level) : std::numeric_limits<float>::max()); - float down_value_lb = (up_index != 0 ? f_close*pow2(samples[down_index].power-level) : std::numeric_limits<float>::max()); + + auto const close_up = (samples[up_index].power-level)/power_range; + auto const close_down = samples[down_index].power-level/power_range; + float up_value_lb = (up_index < samples.size() ? f_close*pow2(close_up) : std::numeric_limits<float>::max()); + float down_value_lb = (up_index != 0 ? f_close*pow2(close_down) : std::numeric_limits<float>::max()); std::size_t count = 0; do { + DEBUG(rand, "%d %d", (int)up_index, (int)down_index); + // at least avoid infinite loops in case of a bug... - if (count > samples.size()) { break; } + if (up_index == samples.size()-1 && down_index == 0) { break; } std::size_t current_index; if (up_value_lb < down_value_lb) @@ -95,7 +102,7 @@ const Sample* SampleSelection::get(level_t level, std::size_t pos) if (up_index != samples.size()-1) { ++up_index; - up_value_lb = f_close*pow2(samples[up_index].power-level); + up_value_lb = f_close*pow2((samples[up_index].power-level)/power_range); } else { @@ -108,7 +115,7 @@ const Sample* SampleSelection::get(level_t level, std::size_t pos) if (down_index != 0) { --down_index; - down_value_lb = f_close*pow2(samples[down_index].power-level); + down_value_lb = f_close*pow2((samples[down_index].power-level)/power_range); } else { @@ -117,7 +124,7 @@ const Sample* SampleSelection::get(level_t level, std::size_t pos) } auto random = rand.floatInRange(0.,1.); - auto close = samples[current_index].power - level; + auto close = (samples[current_index].power - level)/power_range; auto diverse = 1./(1. + (float)(pos - last[current_index])/settings.samplerate); auto value = f_close*pow2(close) + f_diverse*pow2(diverse) + f_random*random; diff --git a/src/settings.h b/src/settings.h index 4872236..84add97 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 = 4.f; - static float constexpr sample_selection_f_diverse_default = .1f; - static float constexpr sample_selection_f_random_default = 0.05f; + 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; 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}; |