diff options
| author | André Nusser <anusser@mpi-inf.mpg.de> | 2021-02-13 12:25:50 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2021-08-09 19:24:06 +0200 |
| commit | 44e2039bd0a218c8c4d1b2ad93c6b4c3ba6360d9 (patch) | |
| tree | 07b3fede1a923fc184cc494635dabc0d6f0db30c | |
| parent | 7b130b359e202e32d3044155b455666e7ae22100 (diff) | |
Small cleaning up and comment.
| -rw-r--r-- | src/sample_selection.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sample_selection.cc b/src/sample_selection.cc index 53417b8..eb023c5 100644 --- a/src/sample_selection.cc +++ b/src/sample_selection.cc @@ -141,8 +141,9 @@ const Sample* SampleSelection::get(level_t level, float position, std::size_t po auto random = rand.floatInRange(0.,1.); auto close = (samples[current_index].power - level)/power_range; auto diverse = 1./(1. + (float)(pos - last[current_index])/settings.samplerate); - auto closepos = (position - samples[current_index].sample->getPosition()); - auto value = f_close*pow2(close) + f_diverse*diverse + f_random*random + f_position*pow2(closepos); + auto closepos = samples[current_index].sample->getPosition() - position; + // note that the value below for close and closepos is actually the weighted squared l2 distance in 2d + auto value = f_close*pow2(close) + f_position*pow2(closepos) + f_diverse*diverse + f_random*random; if (value < value_opt) { |