david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small correction to Peak; expand and fix tests

Browse Source
This commit is contained in:
Chris Cannam
2022-06-09 09:03:20 +01:00
parent 75b1c9abb5
commit 6257457320
2 changed files with 106 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/finer/Peak.h
View File

@@ -98,9 +98,11 @@ public:
int np = i;
if (j < nPeaks) {
np = m_locations[j];
} else if (nPeaks > 0) {
np = m_locations[nPeaks-1];
}
if (next) {
if (pp == i) {
if (pp == i || j >= nPeaks) {
next[i] = i;
} else {
next[i] = np;

122
src/test/TestSignalBits.cpp
View File

@@ -29,19 +29,10 @@
using namespace RubberBand;
using namespace std;
namespace tt = boost::test_tools;
BOOST_AUTO_TEST_SUITE(TestSignalBits)
#define COMPARE_N(a, b, n) \
for (int cmp_i = 0; cmp_i < n; ++cmp_i) { \
BOOST_CHECK_SMALL(a[cmp_i] - b[cmp_i], 1e-14); \
}
#define COMPARE_INT_N(a, b, n) \
for (int cmp_i = 0; cmp_i < n; ++cmp_i) { \
BOOST_CHECK_EQUAL(a[cmp_i], b[cmp_i]); \
}
// NB our moving median has different lag behaviour from bsq - we
// begin padded with zeros, while bsq begins with an empty vector. The
// bsq behaviour is imho more correct, and this really shows up in the
@@ -55,7 +46,7 @@ BOOST_AUTO_TEST_CASE(moving_median_simple_3)
vector<double> arr { 1.0, 2.0, 3.0 };
vector<double> expected { 1.0, 2.0, 2.0 };
MovingMedian<double>::filter(mm, arr);
COMPARE_N(arr, expected, 3);
BOOST_TEST(arr == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(moving_median_simple_4)
@@ -64,7 +55,7 @@ BOOST_AUTO_TEST_CASE(moving_median_simple_4)
vector<double> arr { 1.0, 2.0, 3.0, 4.0 };
vector<double> expected { 2.0, 3.0, 3.0, 3.0 };
MovingMedian<double>::filter(mm, arr);
COMPARE_N(arr, expected, 4);
BOOST_TEST(arr == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(moving_median_simple_3_4)
@@ -73,7 +64,7 @@ BOOST_AUTO_TEST_CASE(moving_median_simple_3_4)
vector<double> arr { 1.2, 0.6, 1.0e-6, 1.0 };
vector<double> expected { 0.6, 0.6, 0.6, 1.0e-6 };
MovingMedian<double>::filter(mm, arr);
COMPARE_N(arr, expected, 4);
BOOST_TEST(arr == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(moving_median_simple_5_4)
@@ -82,7 +73,7 @@ BOOST_AUTO_TEST_CASE(moving_median_simple_5_4)
vector<double> arr { 1.2, 0.6, 1.0e-6, 1.0 };
vector<double> expected { 1.0e-6, 0.6, 0.6, 1.0e-6 };
MovingMedian<double>::filter(mm, arr);
COMPARE_N(arr, expected, 4);
BOOST_TEST(arr == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(moving_median_order_1)
@@ -91,7 +82,7 @@ BOOST_AUTO_TEST_CASE(moving_median_order_1)
vector<double> arr { 1.2, 0.6, 1.0e-6, 1.0e-6 };
vector<double> expected = arr;
MovingMedian<double>::filter(mm, arr);
COMPARE_N(arr, expected, 4);
BOOST_TEST(arr == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(moving_median_n_1)
@@ -100,7 +91,7 @@ BOOST_AUTO_TEST_CASE(moving_median_n_1)
vector<double> arr { 1.0 };
vector<double> expected { 0.0 };
MovingMedian<double>::filter(mm, arr);
COMPARE_N(arr, expected, 1);
BOOST_TEST(arr == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(peakpick_nearest_2_1)
@@ -110,7 +101,7 @@ BOOST_AUTO_TEST_CASE(peakpick_nearest_2_1)
vector<int> out(1);
vector<int> expected { 0 };
pp.findNearestAndNextPeaks(in.data(), 2, out.data(), nullptr);
COMPARE_INT_N(out, expected, 1);
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(peakpick_nearest_2_5)
@@ -120,7 +111,7 @@ BOOST_AUTO_TEST_CASE(peakpick_nearest_2_5)
vector<int> out(5);
vector<int> expected { 3, 3, 3, 3, 3 };
pp.findNearestAndNextPeaks(in.data(), 2, out.data(), nullptr);
COMPARE_INT_N(out, expected, 5);
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(peakpick_nearest_2_12)
@@ -131,7 +122,100 @@ BOOST_AUTO_TEST_CASE(peakpick_nearest_2_12)
vector<int> out(12);
vector<int> expected { 3, 3, 3, 3, 3, 3, 8, 8, 8, 8, 8, 8 };
pp.findNearestAndNextPeaks(in.data(), 2, out.data(), nullptr);
COMPARE_INT_N(out, expected, 12);
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(peakpick_next_2_1)
{
Peak<double> pp(1);
vector<double> in { -0.1 };
vector<int> out(1);
vector<int> expected { 0 };
pp.findNearestAndNextPeaks(in.data(), 2, nullptr, out.data());
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(peakpick_next_2_5)
{
Peak<double> pp(5);
vector<double> in { -0.3, -0.1, -0.2, 1.0, -0.3 };
vector<int> out(5);
vector<int> expected { 3, 3, 3, 3, 4 };
pp.findNearestAndNextPeaks(in.data(), 2, nullptr, out.data());
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(peakpick_next_2_12)
{
Peak<double> pp(12);
vector<double> in { -0.3, -0.1, 0.2, -1.0, -0.3, -0.5,
-0.5, -0.4, -0.1, -0.1, -0.2, -0.3 };
vector<int> out(12);
vector<int> expected { 2, 2, 2, 8, 8, 8, 8, 8, 8, 9, 10, 11 };
pp.findNearestAndNextPeaks(in.data(), 2, nullptr, out.data());
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(troughpick_nearest_2_1)
{
Peak<double, std::less<double>> pp(1);
vector<double> in { -0.1 };
vector<int> out(1);
vector<int> expected { 0 };
pp.findNearestAndNextPeaks(in.data(), 2, out.data(), nullptr);
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(troughpick_nearest_2_5)
{
Peak<double, std::less<double>> pp(5);
vector<double> in { -0.3, -0.1, -0.4, 0.1, -0.3 };
vector<int> out(5);
vector<int> expected { 2, 2, 2, 2, 2 };
pp.findNearestAndNextPeaks(in.data(), 2, out.data(), nullptr);
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(troughpick_nearest_2_12)
{
Peak<double, std::less<double>> pp(12);
vector<double> in { -0.3, -0.1, -0.2, 1.0, -0.3, -0.5,
-0.5, -0.4, -0.1, -0.1, -0.2, -0.3 };
vector<int> out(12);
vector<int> expected { 0, 0, 0, 5, 5, 5, 5, 5, 11, 11, 11, 11 };
pp.findNearestAndNextPeaks(in.data(), 2, out.data(), nullptr);
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(troughpick_next_2_1)
{
Peak<double, std::less<double>> pp(1);
vector<double> in { -0.1 };
vector<int> out(1);
vector<int> expected { 0 };
pp.findNearestAndNextPeaks(in.data(), 2, nullptr, out.data());
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(troughpick_next_2_5)
{
Peak<double, std::less<double>> pp(5);
vector<double> in { -0.3, -0.1, -0.4, 0.1, -0.3 };
vector<int> out(5);
vector<int> expected { 2, 2, 2, 3, 4 };
pp.findNearestAndNextPeaks(in.data(), 2, nullptr, out.data());
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_CASE(troughpick_next_2_12)
{
Peak<double, std::less<double>> pp(12);
vector<double> in { -0.3, -0.1, 0.2, 1.0, -0.3, -0.5,
-0.5, -0.4, -0.1, -0.1, -0.2, -0.3 };
vector<int> out(12);
vector<int> expected { 0, 5, 5, 5, 5, 5, 11, 11, 11, 11, 11, 11 };
pp.findNearestAndNextPeaks(in.data(), 2, nullptr, out.data());
BOOST_TEST(out == expected, tt::per_element());
}
BOOST_AUTO_TEST_SUITE_END()