commit aa4b716e9b46f91f6cbb2bcd7fa72fbc1a2e3db7
parent 0d8fc456f716bc1f0420dcc8f27274fa87e1ccad
Author: [email protected] <[email protected]>
Date: Fri, 12 Aug 2016 09:36:21 +0300
Version 1.0.0.
Diffstat:
14 files changed, 270 insertions(+), 288 deletions(-)
diff --git a/include/kfr/base/basic_expressions.hpp b/include/kfr/base/basic_expressions.hpp
@@ -70,7 +70,7 @@ CMT_INLINE auto sequence(T x, Ts... rest)
{
const T seq[] = { x, static_cast<T>(rest)... };
constexpr size_t N = arraysize(seq);
- return lambda([=](size_t index) { return seq[index % N]; });
+ return typed<T>(lambda([=](size_t index) { return seq[index % N]; }));
}
CMT_INLINE auto zeros()
{
diff --git a/include/kfr/base/kfr.h b/include/kfr/base/kfr.h
@@ -12,11 +12,11 @@ using ::cid::arraysize;
}
#endif
-#define KFR_VERSION_STRING "0.9.1"
-#define KFR_VERSION_MAJOR 0
-#define KFR_VERSION_MINOR 9
-#define KFR_VERSION_BUILD 1
-#define KFR_VERSION 901
+#define KFR_VERSION_STRING "1.0.0"
+#define KFR_VERSION_MAJOR 1
+#define KFR_VERSION_MINOR 0
+#define KFR_VERSION_BUILD 0
+#define KFR_VERSION 10000
#ifdef __cplusplus
namespace kfr
diff --git a/include/kfr/base/operators.hpp b/include/kfr/base/operators.hpp
@@ -696,6 +696,13 @@ struct expression_pack : expression<E...>, output_expression
output(index, x, csizeseq<count>);
}
+ template <typename Input, KFR_ENABLE_IF(is_input_expression<Input>::value)>
+ CMT_INLINE expression_pack& operator=(Input&& input)
+ {
+ process<value_type>(*this, std::forward<Input>(input), size());
+ return *this;
+ }
+
private:
template <typename U, size_t N, size_t... indices>
void output(size_t index, const vec<vec<U, count>, N>& x, csizes_t<indices...>)
diff --git a/include/kfr/dsp/dcremove.hpp b/include/kfr/dsp/dcremove.hpp
@@ -28,7 +28,7 @@
namespace kfr
{
-template <typename T, typename E1>
+template <typename E1, typename T = flt_type<value_type_of<E1>>>
CMT_INLINE internal::expression_biquads<1, T, internal::arg<E1>> dcremove(E1&& e1, double cutoff = 0.00025)
{
const biquad_params<T> bqs[1] = { biquad_highpass(cutoff, 0.5) };
diff --git a/include/kfr/dsp/fir.hpp b/include/kfr/dsp/fir.hpp
@@ -107,7 +107,7 @@ template <typename T, size_t TapCount, typename E1>
CMT_INLINE internal::expression_short_fir<TapCount, T, E1> short_fir(E1&& e1,
const univector<T, TapCount>& taps)
{
- static_assert(TapCount >= 1 && TapCount < 16, "Use short_fir only for small FIR filters");
+ static_assert(TapCount >= 1 && TapCount <= 32, "Use short_fir only for small FIR filters");
return internal::expression_short_fir<TapCount, T, E1>(std::forward<E1>(e1), taps.ref());
}
}
diff --git a/include/kfr/dsp/mixdown.hpp b/include/kfr/dsp/mixdown.hpp
@@ -51,6 +51,9 @@ struct stereo_matrix
};
}
+constexpr f64x2x2 matrix_sum_diff() { return { f64x2{ 1, 1 }, f64x2{ 1, -1 } }; }
+constexpr f64x2x2 matrix_halfsum_halfdiff() { return { f64x2{ 0.5, 0.5 }, f64x2{ 0.5, -0.5 } }; }
+
template <typename Left, typename Right,
typename Result = internal::expression_function<
internal::stereo_matrix, internal::expression_pack<internal::arg<Left>, internal::arg<Right>>>>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -44,20 +44,14 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/tests/cmake/")
find_package(MPFR)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/tests/cmake/")
-
-find_package(MPFR)
-
-add_executable(basic_vector_test basic_vector_test.cpp ${KFR_SRC})
add_executable(intrinsic_test intrinsic_test.cpp ${KFR_SRC})
add_executable(dft_test dft_test.cpp ${KFR_SRC})
-add_executable(conv_test conv_test.cpp ${KFR_SRC})
if (MPFR_FOUND)
include_directories(${MPFR_INCLUDE_DIR})
add_executable(transcendental_test transcendental_test.cpp ${KFR_SRC})
target_link_libraries(transcendental_test ${MPFR_LIBRARIES})
endif ()
-add_executable(fracdelay_test fracdelay_test.cpp ${KFR_SRC})
+add_executable(dsp_test dsp_test.cpp ${KFR_SRC})
add_executable(empty_test empty_test.cpp ${KFR_SRC})
add_executable(complex_test complex_test.cpp ${KFR_SRC})
add_executable(vec_test vec_test.cpp ${KFR_SRC})
@@ -72,22 +66,18 @@ endif ()
if (NOT IOS)
enable_testing()
- add_test(NAME basic_vector_test
- COMMAND ${EMULATOR} ${PROJECT_BINARY_DIR}/tests/basic_vector_test)
+ add_test(NAME vec_test
+ COMMAND ${EMULATOR} ${PROJECT_BINARY_DIR}/tests/vec_test)
add_test(NAME intrinsic_test
COMMAND ${EMULATOR} ${PROJECT_BINARY_DIR}/tests/intrinsic_test)
- add_test(NAME fracdelay_test
- COMMAND ${EMULATOR} ${PROJECT_BINARY_DIR}/tests/fracdelay_test)
- add_test(NAME conv_test
- COMMAND ${EMULATOR} ${PROJECT_BINARY_DIR}/tests/conv_test)
+ add_test(NAME dsp_test
+ COMMAND ${EMULATOR} ${PROJECT_BINARY_DIR}/tests/dsp_test)
if (MPFR_FOUND)
add_test(NAME transcendental_test
COMMAND ${EMULATOR} ${PROJECT_BINARY_DIR}/tests/transcendental_test)
endif ()
add_test(NAME complex_test
COMMAND ${EMULATOR} ${PROJECT_BINARY_DIR}/tests/complex_test)
- add_test(NAME vec_test
- COMMAND ${EMULATOR} ${PROJECT_BINARY_DIR}/tests/vec_test)
add_test(NAME stat_test
COMMAND ${EMULATOR} ${PROJECT_BINARY_DIR}/tests/stat_test)
diff --git a/tests/basic_vector_test.cpp b/tests/basic_vector_test.cpp
@@ -1,104 +0,0 @@
-/**
- * KFR (http://kfrlib.com)
- * Copyright (C) 2016 D Levin
- * See LICENSE.txt for details
- */
-
-#include <kfr/io/tostring.hpp>
-
-#include <kfr/cometa/string.hpp>
-#include <kfr/math.hpp>
-#include <kfr/version.hpp>
-
-#include "testo/testo.hpp"
-
-using namespace kfr;
-
-TEST(test)
-{
- // How to make a vector:
-
- // * Use constructor
- const vec<double, 4> first{ 1, 2.5, -infinity, 3.1415926 };
- CHECK(first == vec<double, 4>{ 1, 2.5, -infinity, 3.1415926 });
-
- // * Use make_vector function
- const auto second = make_vector(-1, +1);
- CHECK(second == vec<int, 2>{ -1, 1 });
-
- // * Convert from vector of other type:
- const vec<int, 4> int_vector{ 10, 20, 30, 40 };
- const vec<double, 4> double_vector = cast<double>(int_vector);
- CHECK(double_vector == vec<double, 4>{ 10, 20, 30, 40 });
-
- // * Concat two vectors:
- const vec<int, 1> left_part{ 1 };
- const vec<int, 1> right_part{ 2 };
- const vec<int, 2> pair{ left_part, right_part };
- CHECK(pair == vec<int, 2>{ 1, 2 });
-
- // * Same, but using make_vector and concat:
- const vec<int, 2> pair2 = concat(make_vector(10), make_vector(20));
- CHECK(pair2 == vec<int, 2>{ 10, 20 });
-
- // * Repeat vector multiple times:
- const vec<short, 8> repeated = repeat<4>(make_vector<short>(0, -1));
- CHECK(repeated == vec<short, 8>{ 0, -1, 0, -1, 0, -1, 0, -1 });
-
- // * Use enumerate to generate sequence of numbers:
- const vec<int, 8> eight = enumerate<int, 8>();
- CHECK(eight == vec<int, 8>{ 0, 1, 2, 3, 4, 5, 6, 7 });
-
- // * Vectors can be of any length...
- const vec<int, 1> one{ 42 };
- const vec<int, 2> two = concat(one, make_vector(42));
- CHECK(two == vec<int, 2>{ 42, 42 });
-
- const vec<u8, 256> very_long_vector = repeat<64>(make_vector<u8>(1, 2, 4, 8));
- CHECK(slice<0, 17>(very_long_vector) ==
- vec<unsigned char, 17>{ 1, 2, 4, 8, 1, 2, 4, 8, 1, 2, 4, 8, 1, 2, 4, 8, 1 });
-
- // * ...really any:
- using big_vector = vec<i16, 107>;
- big_vector v107 = enumerate<i16, 107>();
- CHECK(hadd(v107) == static_cast<short>(5671));
-
- using color = vec<u8, 3>;
- const color green = cast<u8>(make_vector(0.0, 1.0, 0.0) * 255);
- CHECK(green == vec<unsigned char, 3>{ 0, 255, 0 });
-
- // Vectors support all standard operators:
- const auto op1 = make_vector(0, 1, 10, 100);
- const auto op2 = make_vector(20, 2, -2, 200);
- const auto result = op1 * op2 - 4;
- CHECK(result == vec<int, 4>{ -4, -2, -24, 19996 });
-
- // * Transform vector:
- const vec<int, 8> numbers1 = enumerate<int, 8>();
- const vec<int, 8> numbers2 = enumerate<int, 8>() + 100;
- CHECK(odd(numbers1) == vec<int, 4>{ 1, 3, 5, 7 });
- CHECK(even(numbers2) == vec<int, 4>{ 100, 102, 104, 106 });
-
- // * The following command pairs are equivalent:
- CHECK(permute(numbers1, elements<0, 2, 1, 3, 4, 6, 5, 7>) == vec<int, 8>{ 0, 2, 1, 3, 4, 6, 5, 7 });
- CHECK(permute(numbers1, elements<0, 2, 1, 3>) == vec<int, 8>{ 0, 2, 1, 3, 4, 6, 5, 7 });
-
- CHECK(shuffle(numbers1, numbers2, elements<0, 8, 2, 10, 4, 12, 6, 14>) ==
- vec<int, 8>{ 0, 100, 2, 102, 4, 104, 6, 106 });
- CHECK(shuffle(numbers1, numbers2, elements<0, 8>) == vec<int, 8>{ 0, 100, 2, 102, 4, 104, 6, 106 });
-
- CHECK(blend(numbers1, numbers2, elements<0, 1, 1, 0, 1, 1, 0, 1>) ==
- vec<int, 8>{ 0, 101, 102, 3, 104, 105, 6, 107 });
- CHECK(blend(numbers1, numbers2, elements<0, 1, 1>) == vec<int, 8>{ 0, 101, 102, 3, 104, 105, 6, 107 });
-
- // * Transpose matrix:
- const auto sixteen = enumerate<float, 16>();
- CHECK(transpose<4>(sixteen) == vec<float, 16>{ 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15 });
-}
-
-int main(int /*argc*/, char** /*argv*/)
-{
- println(library_version());
-
- return testo::run_all("", true);
-}
diff --git a/tests/conv_test.cpp b/tests/conv_test.cpp
@@ -1,34 +0,0 @@
-/**
- * KFR (http://kfrlib.com)
- * Copyright (C) 2016 D Levin
- * See LICENSE.txt for details
- */
-
-// library_version()
-#include <kfr/io/tostring.hpp>
-#include <kfr/version.hpp>
-
-#include <kfr/base/reduce.hpp>
-
-#include <tuple>
-
-#include "testo/testo.hpp"
-#include <kfr/dft/conv.hpp>
-
-using namespace kfr;
-
-TEST(test_convolve)
-{
- univector<fbase, 5> a({ 1, 2, 3, 4, 5 });
- univector<fbase, 5> b({ 0.25, 0.5, 1.0, 0.5, 0.25 });
- univector<fbase> c = convolve(a, b);
- CHECK(c.size() == 9);
- CHECK(rms(c - univector<fbase>({ 0.25, 1., 2.75, 5., 7.5, 8.5, 7.75, 3.5, 1.25 })) < 0.0001);
-}
-
-int main(int argc, char** argv)
-{
- println(library_version());
-
- return testo::run_all("", true);
-}
diff --git a/tests/dft_test.cpp b/tests/dft_test.cpp
@@ -15,6 +15,7 @@
#include <kfr/base/reduce.hpp>
#include <kfr/cometa/string.hpp>
#include <kfr/dft/fft.hpp>
+#include <kfr/dft/conv.hpp>
#include <kfr/dft/reference_dft.hpp>
#include <kfr/io/tostring.hpp>
#include <kfr/math.hpp>
@@ -28,6 +29,15 @@ constexpr ctypes_t<float, double> float_types{};
constexpr ctypes_t<float> float_types{};
#endif
+TEST(test_convolve)
+{
+ univector<fbase, 5> a({ 1, 2, 3, 4, 5 });
+ univector<fbase, 5> b({ 0.25, 0.5, 1.0, 0.5, 0.25 });
+ univector<fbase> c = convolve(a, b);
+ CHECK(c.size() == 9);
+ CHECK(rms(c - univector<fbase>({ 0.25, 1., 2.75, 5., 7.5, 8.5, 7.75, 3.5, 1.25 })) < 0.0001);
+}
+
TEST(fft_accuracy)
{
testo::active_test()->show_progress = true;
diff --git a/tests/dsp_test.cpp b/tests/dsp_test.cpp
@@ -0,0 +1,75 @@
+/**
+ * KFR (http://kfrlib.com)
+ * Copyright (C) 2016 D Levin
+ * See LICENSE.txt for details
+ */
+
+#include <kfr/io/tostring.hpp>
+
+#include "testo/testo.hpp"
+#include <kfr/dsp.hpp>
+#include <kfr/math.hpp>
+
+using namespace kfr;
+
+TEST(delay)
+{
+ const univector<float, 33> v1 = counter() + 100;
+ const univector<float, 33> v2 = delay(v1);
+ CHECK(v2[0] == 0);
+ CHECK(v2[1] == 100);
+ CHECK(v2[2] == 101);
+ CHECK(v2[19] == 118);
+
+ const univector<float, 33> v3 = delay(v1, csize<3>);
+ CHECK(v3[0] == 0);
+ CHECK(v3[1] == 0);
+ CHECK(v3[2] == 0);
+ CHECK(v3[3] == 100);
+ CHECK(v3[4] == 101);
+ CHECK(v3[19] == 116);
+}
+
+TEST(fracdelay)
+{
+ univector<double, 5> a({ 1, 2, 3, 4, 5 });
+ univector<double, 5> b = fracdelay(a, 0.5);
+ CHECK(rms(b - univector<double>({ 0.5, 1.5, 2.5, 3.5, 4.5 })) < c_epsilon<double> * 5);
+
+ b = fracdelay(a, 0.1);
+ CHECK(rms(b - univector<double>({ 0.9, 1.9, 2.9, 3.9, 4.9 })) < c_epsilon<double> * 5);
+
+ b = fracdelay(a, 0.0);
+ CHECK(rms(b - univector<double>({ 1, 2, 3, 4, 5 })) < c_epsilon<double> * 5);
+
+ b = fracdelay(a, 1.0);
+ CHECK(rms(b - univector<double>({ 0, 1, 2, 3, 4 })) < c_epsilon<double> * 5);
+}
+
+TEST(mixdown)
+{
+ univector<double, 20> ch1 = counter();
+ univector<double, 20> ch2 = counter() * 2 + 100;
+ univector<double, 20> mix = mixdown(ch1, ch2);
+ CHECK(mix[0] == 100);
+ CHECK(mix[1] == 103);
+ CHECK(mix[19] == 157);
+}
+
+TEST(mixdown_stereo)
+{
+ const univector<double, 21> left = counter();
+ const univector<double, 21> right = counter() * 2 + 100;
+ univector<double, 21> mid;
+ univector<double, 21> side;
+ pack(mid, side) = mixdown_stereo(left, right, matrix_sum_diff());
+
+ CHECK(mid[0] == 100);
+ CHECK(side[0] == -100);
+ CHECK(mid[1] == 103);
+ CHECK(side[1] == -101);
+ CHECK(mid[20] == 160);
+ CHECK(side[20] == -120);
+}
+
+int main(int argc, char** argv) { return testo::run_all("", true); }
diff --git a/tests/fracdelay_test.cpp b/tests/fracdelay_test.cpp
@@ -1,41 +0,0 @@
-/**
- * KFR (http://kfrlib.com)
- * Copyright (C) 2016 D Levin
- * See LICENSE.txt for details
- */
-
-// library_version()
-#include <kfr/io/tostring.hpp>
-#include <kfr/version.hpp>
-
-#include <kfr/base/reduce.hpp>
-
-#include <tuple>
-
-#include "testo/testo.hpp"
-#include <kfr/dsp/fracdelay.hpp>
-
-using namespace kfr;
-
-TEST(test_fracdelay)
-{
- univector<double, 5> a({ 1, 2, 3, 4, 5 });
- univector<double, 5> b = fracdelay(a, 0.5);
- CHECK(rms(b - univector<double>({ 0.5, 1.5, 2.5, 3.5, 4.5 })) < c_epsilon<double> * 5);
-
- b = fracdelay(a, 0.1);
- CHECK(rms(b - univector<double>({ 0.9, 1.9, 2.9, 3.9, 4.9 })) < c_epsilon<double> * 5);
-
- b = fracdelay(a, 0.0);
- CHECK(rms(b - univector<double>({ 1, 2, 3, 4, 5 })) < c_epsilon<double> * 5);
-
- b = fracdelay(a, 1.0);
- CHECK(rms(b - univector<double>({ 0, 1, 2, 3, 4 })) < c_epsilon<double> * 5);
-}
-
-int main(int argc, char** argv)
-{
- println(library_version());
-
- return testo::run_all("", true);
-}
diff --git a/tests/intrinsic_test.cpp b/tests/intrinsic_test.cpp
@@ -8,6 +8,7 @@
#include "testo/testo.hpp"
#include <kfr/math.hpp>
+#include <kfr/dsp.hpp>
using namespace kfr;
@@ -210,6 +211,15 @@ TEST(intrin_round)
TEST(intrin_min_max)
{
+ testo::assert_is_same<decltype(min(1, 2)), int>();
+ testo::assert_is_same<decltype(min(1, 2u)), unsigned int>();
+ testo::assert_is_same<decltype(min(1, 2)), int>();
+ testo::assert_is_same<decltype(min(pack(1), 2u)), u32x1>();
+ testo::assert_is_same<decltype(min(2u, pack(1))), u32x1>();
+ testo::assert_is_same<decltype(min(pack(1), pack(2u))), u32x1>();
+ testo::assert_is_same<decltype(min(pack(1, 2, 3), pack(1.0, 2.0, 3.0))), f64x3>();
+ testo::assert_is_same<decltype(min(pack(1.0, 2.0, 3.0), pack(1, 2, 3))), f64x3>();
+
CHECK(min(1, 2) == 1);
CHECK(min(1, 2u) == 1u);
CHECK(min(pack(1), 2) == pack(1));
@@ -316,4 +326,73 @@ TEST(intrin_any_all)
});
}
+TEST(intrin_math)
+{
+ testo::assert_is_same<decltype(pack(11) * pack(0.5)), f64x1>();
+ testo::assert_is_same<decltype(pack(11) * 0.5), f64x1>();
+ testo::assert_is_same<decltype(kfr::sin(2)), fbase>();
+ testo::assert_is_same<decltype(kfr::sin(pack(2))), vec<fbase, 1>>();
+ testo::assert_is_same<decltype(kfr::sindeg(2)), fbase>();
+ testo::assert_is_same<decltype(kfr::sindeg(pack(2))), vec<fbase, 1>>();
+
+ CHECK(pack(11) * pack(0.5) == 5.5);
+ CHECK(pack(11) * 0.5 == 5.5);
+ CHECK(kfr::sin(2) == fbase(0.90929742682568169539601986591174));
+ CHECK(kfr::sin(pack(2)) == pack(fbase(0.90929742682568169539601986591174)));
+ CHECK(kfr::sindeg(2) == fbase(0.03489949670250097164599518162533));
+ CHECK(kfr::sindeg(pack(2)) == pack(fbase(0.03489949670250097164599518162533)));
+ CHECK(kfr::cos(2) == fbase(-0.41614683654714238699756822950076));
+ CHECK(kfr::cos(pack(2)) == pack(fbase(-0.41614683654714238699756822950076)));
+ CHECK(kfr::cosdeg(2) == fbase(0.99939082701909573000624344004393));
+ CHECK(kfr::cosdeg(pack(2)) == pack(fbase(0.99939082701909573000624344004393)));
+
+ CHECK(kfr::log(2) == fbase(0.6931471805599453));
+ CHECK(kfr::log(pack(2)) == pack(fbase(0.6931471805599453)));
+ CHECK(kfr::log2(2) == fbase(1.0));
+ CHECK(kfr::log2(pack(2)) == pack(fbase(1.0)));
+ CHECK(kfr::log10(2) == fbase(0.30102999566398119521373889472449));
+ CHECK(kfr::log10(pack(2)) == pack(fbase(0.30102999566398119521373889472449)));
+
+ CHECK(kfr::exp(2) == fbase(7.3890560989306502));
+ CHECK(kfr::exp(pack(2)) == pack(fbase(7.3890560989306502)));
+ CHECK(kfr::exp2(2) == fbase(4.0));
+ CHECK(kfr::exp2(pack(2)) == pack(fbase(4.0)));
+
+ CHECK(kfr::logn(2, 10) == fbase(0.30102999566398119521373889472449));
+ CHECK(kfr::logn(pack(2), pack(10)) == pack(fbase(0.30102999566398119521373889472449)));
+
+ CHECK(kfr::pow(2, fbase(0.9)) == fbase(1.8660659830736148319626865322999));
+ CHECK(kfr::pow(pack(2), pack(fbase(0.9))) == pack(fbase(1.8660659830736148319626865322999)));
+
+ CHECK(kfr::root(fbase(1.5), 2) == fbase(1.2247448713915890490986420373529));
+ CHECK(kfr::root(pack(fbase(1.5)), pack(2)) == pack(fbase(1.2247448713915890490986420373529)));
+
+ testo::epsilon<float>() *= 10.0;
+ testo::epsilon<double>() *= 10.0;
+
+ CHECK(kfr::sinh(2) == fbase(3.6268604078470187676682139828013));
+ CHECK(kfr::sinh(pack(2)) == pack(fbase(3.6268604078470187676682139828013)));
+ CHECK(kfr::cosh(2) == fbase(3.7621956910836314595622134777737));
+ CHECK(kfr::cosh(pack(2)) == pack(fbase(3.7621956910836314595622134777737)));
+
+ CHECK(kfr::tanh(2) == fbase(0.96402758007581688394641372410092));
+ CHECK(kfr::tanh(pack(2)) == pack(fbase(0.96402758007581688394641372410092)));
+ CHECK(kfr::coth(2) == fbase(1.0373147207275480958778097647678));
+ CHECK(kfr::coth(pack(2)) == pack(fbase(1.0373147207275480958778097647678)));
+
+ testo::epsilon<float>() *= 10.0;
+ testo::epsilon<double>() *= 10.0;
+
+ CHECK(kfr::tan(2) == fbase(-2.1850398632615189916433061023137));
+ CHECK(kfr::tan(pack(2)) == pack(fbase(-2.1850398632615189916433061023137)));
+ CHECK(kfr::tandeg(2) == fbase(0.03492076949174773050040262577373));
+ CHECK(kfr::tandeg(pack(2)) == pack(fbase(0.03492076949174773050040262577373)));
+
+ testo::epsilon<float>() *= 10.0;
+ testo::epsilon<double>() *= 10.0;
+
+ CHECK(kfr::note_to_hertz(60) == fbase(261.6255653005986346778499935233));
+ CHECK(kfr::note_to_hertz(pack(60)) == pack(fbase(261.6255653005986346778499935233)));
+}
+
int main(int argc, char** argv) { return testo::run_all("", false); }
diff --git a/tests/vec_test.cpp b/tests/vec_test.cpp
@@ -12,6 +12,88 @@
using namespace kfr;
+TEST(test_basic)
+{
+ // How to make a vector:
+
+ // * Use constructor
+ const vec<double, 4> first{ 1, 2.5, -infinity, 3.1415926 };
+ CHECK(first == vec<double, 4>{ 1, 2.5, -infinity, 3.1415926 });
+
+ // * Use make_vector function
+ const auto second = make_vector(-1, +1);
+ CHECK(second == vec<int, 2>{ -1, 1 });
+
+ // * Convert from vector of other type:
+ const vec<int, 4> int_vector{ 10, 20, 30, 40 };
+ const vec<double, 4> double_vector = cast<double>(int_vector);
+ CHECK(double_vector == vec<double, 4>{ 10, 20, 30, 40 });
+
+ // * Concat two vectors:
+ const vec<int, 1> left_part{ 1 };
+ const vec<int, 1> right_part{ 2 };
+ const vec<int, 2> pair{ left_part, right_part };
+ CHECK(pair == vec<int, 2>{ 1, 2 });
+
+ // * Same, but using make_vector and concat:
+ const vec<int, 2> pair2 = concat(make_vector(10), make_vector(20));
+ CHECK(pair2 == vec<int, 2>{ 10, 20 });
+
+ // * Repeat vector multiple times:
+ const vec<short, 8> repeated = repeat<4>(make_vector<short>(0, -1));
+ CHECK(repeated == vec<short, 8>{ 0, -1, 0, -1, 0, -1, 0, -1 });
+
+ // * Use enumerate to generate sequence of numbers:
+ const vec<int, 8> eight = enumerate<int, 8>();
+ CHECK(eight == vec<int, 8>{ 0, 1, 2, 3, 4, 5, 6, 7 });
+
+ // * Vectors can be of any length...
+ const vec<int, 1> one{ 42 };
+ const vec<int, 2> two = concat(one, make_vector(42));
+ CHECK(two == vec<int, 2>{ 42, 42 });
+
+ const vec<u8, 256> very_long_vector = repeat<64>(make_vector<u8>(1, 2, 4, 8));
+ CHECK(slice<0, 17>(very_long_vector) ==
+ vec<unsigned char, 17>{ 1, 2, 4, 8, 1, 2, 4, 8, 1, 2, 4, 8, 1, 2, 4, 8, 1 });
+
+ // * ...really any:
+ using big_vector = vec<i16, 107>;
+ big_vector v107 = enumerate<i16, 107>();
+ CHECK(hadd(v107) == static_cast<short>(5671));
+
+ using color = vec<u8, 3>;
+ const color green = cast<u8>(make_vector(0.0, 1.0, 0.0) * 255);
+ CHECK(green == vec<unsigned char, 3>{ 0, 255, 0 });
+
+ // Vectors support all standard operators:
+ const auto op1 = make_vector(0, 1, 10, 100);
+ const auto op2 = make_vector(20, 2, -2, 200);
+ const auto result = op1 * op2 - 4;
+ CHECK(result == vec<int, 4>{ -4, -2, -24, 19996 });
+
+ // * Transform vector:
+ const vec<int, 8> numbers1 = enumerate<int, 8>();
+ const vec<int, 8> numbers2 = enumerate<int, 8>() + 100;
+ CHECK(odd(numbers1) == vec<int, 4>{ 1, 3, 5, 7 });
+ CHECK(even(numbers2) == vec<int, 4>{ 100, 102, 104, 106 });
+
+ // * The following command pairs are equivalent:
+ CHECK(permute(numbers1, elements<0, 2, 1, 3, 4, 6, 5, 7>) == vec<int, 8>{ 0, 2, 1, 3, 4, 6, 5, 7 });
+ CHECK(permute(numbers1, elements<0, 2, 1, 3>) == vec<int, 8>{ 0, 2, 1, 3, 4, 6, 5, 7 });
+
+ CHECK(shuffle(numbers1, numbers2, elements<0, 8, 2, 10, 4, 12, 6, 14>) ==
+ vec<int, 8>{ 0, 100, 2, 102, 4, 104, 6, 106 });
+ CHECK(shuffle(numbers1, numbers2, elements<0, 8>) == vec<int, 8>{ 0, 100, 2, 102, 4, 104, 6, 106 });
+
+ CHECK(blend(numbers1, numbers2, elements<0, 1, 1, 0, 1, 1, 0, 1>) ==
+ vec<int, 8>{ 0, 101, 102, 3, 104, 105, 6, 107 });
+ CHECK(blend(numbers1, numbers2, elements<0, 1, 1>) == vec<int, 8>{ 0, 101, 102, 3, 104, 105, 6, 107 });
+
+ // * Transpose matrix:
+ const auto sixteen = enumerate<float, 16>();
+ CHECK(transpose<4>(sixteen) == vec<float, 16>{ 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15 });
+}
+
TEST(vec_concat)
{
CHECK(concat(vec<f32, 1>{ 1 }, vec<f32, 2>{ 2, 3 }, vec<f32, 1>{ 4 }, vec<f32, 3>{ 5, 6, 7 }) //
@@ -115,92 +197,6 @@ TEST(vec_low_high)
CHECK(high(vec<u8, 2>(1, 2)) == vec<u8, 1>(2));
}
-TEST(vec_conv)
-{
- testo::assert_is_same<common_type<i32, f32>, f32>();
- testo::assert_is_same<common_type<f32, f64>, f64>();
- testo::assert_is_same<common_type<i32, f32x4>, f32x4>();
- testo::assert_is_same<common_type<f32x4, f64>, f64x4>();
- testo::assert_is_same<common_type<f64, f32x4>, f64x4>();
- testo::assert_is_same<common_type<f32x4, f64x4>, f64x4>();
-
- testo::assert_is_same<decltype(min(1, 2)), int>();
- testo::assert_is_same<decltype(min(1, 2u)), unsigned int>();
- testo::assert_is_same<decltype(min(1, 2)), int>();
- testo::assert_is_same<decltype(min(pack(1), 2u)), u32x1>();
- testo::assert_is_same<decltype(min(2u, pack(1))), u32x1>();
- testo::assert_is_same<decltype(min(pack(1), pack(2u))), u32x1>();
- testo::assert_is_same<decltype(min(pack(1, 2, 3), pack(1.0, 2.0, 3.0))), f64x3>();
- testo::assert_is_same<decltype(min(pack(1.0, 2.0, 3.0), pack(1, 2, 3))), f64x3>();
-
- testo::assert_is_same<decltype(pack(11) * pack(0.5)), f64x1>();
- testo::assert_is_same<decltype(pack(11) * 0.5), f64x1>();
-
- testo::assert_is_same<decltype(kfr::sin(2)), fbase>();
- testo::assert_is_same<decltype(kfr::sin(pack(2))), vec<fbase, 1>>();
- testo::assert_is_same<decltype(kfr::sindeg(2)), fbase>();
- testo::assert_is_same<decltype(kfr::sindeg(pack(2))), vec<fbase, 1>>();
-
- CHECK(pack(11) * pack(0.5) == 5.5);
- CHECK(pack(11) * 0.5 == 5.5);
- CHECK(kfr::sin(2) == fbase(0.90929742682568169539601986591174));
- CHECK(kfr::sin(pack(2)) == pack(fbase(0.90929742682568169539601986591174)));
- CHECK(kfr::sindeg(2) == fbase(0.03489949670250097164599518162533));
- CHECK(kfr::sindeg(pack(2)) == pack(fbase(0.03489949670250097164599518162533)));
- CHECK(kfr::cos(2) == fbase(-0.41614683654714238699756822950076));
- CHECK(kfr::cos(pack(2)) == pack(fbase(-0.41614683654714238699756822950076)));
- CHECK(kfr::cosdeg(2) == fbase(0.99939082701909573000624344004393));
- CHECK(kfr::cosdeg(pack(2)) == pack(fbase(0.99939082701909573000624344004393)));
-
- CHECK(kfr::log(2) == fbase(0.6931471805599453));
- CHECK(kfr::log(pack(2)) == pack(fbase(0.6931471805599453)));
- CHECK(kfr::log2(2) == fbase(1.0));
- CHECK(kfr::log2(pack(2)) == pack(fbase(1.0)));
- CHECK(kfr::log10(2) == fbase(0.30102999566398119521373889472449));
- CHECK(kfr::log10(pack(2)) == pack(fbase(0.30102999566398119521373889472449)));
-
- CHECK(kfr::exp(2) == fbase(7.3890560989306502));
- CHECK(kfr::exp(pack(2)) == pack(fbase(7.3890560989306502)));
- CHECK(kfr::exp2(2) == fbase(4.0));
- CHECK(kfr::exp2(pack(2)) == pack(fbase(4.0)));
-
- CHECK(kfr::logn(2, 10) == fbase(0.30102999566398119521373889472449));
- CHECK(kfr::logn(pack(2), pack(10)) == pack(fbase(0.30102999566398119521373889472449)));
-
- CHECK(kfr::pow(2, fbase(0.9)) == fbase(1.8660659830736148319626865322999));
- CHECK(kfr::pow(pack(2), pack(fbase(0.9))) == pack(fbase(1.8660659830736148319626865322999)));
-
- CHECK(kfr::root(fbase(1.5), 2) == fbase(1.2247448713915890490986420373529));
- CHECK(kfr::root(pack(fbase(1.5)), pack(2)) == pack(fbase(1.2247448713915890490986420373529)));
-
- testo::epsilon<float>() *= 10.0;
- testo::epsilon<double>() *= 10.0;
-
- CHECK(kfr::sinh(2) == fbase(3.6268604078470187676682139828013));
- CHECK(kfr::sinh(pack(2)) == pack(fbase(3.6268604078470187676682139828013)));
- CHECK(kfr::cosh(2) == fbase(3.7621956910836314595622134777737));
- CHECK(kfr::cosh(pack(2)) == pack(fbase(3.7621956910836314595622134777737)));
-
- CHECK(kfr::tanh(2) == fbase(0.96402758007581688394641372410092));
- CHECK(kfr::tanh(pack(2)) == pack(fbase(0.96402758007581688394641372410092)));
- CHECK(kfr::coth(2) == fbase(1.0373147207275480958778097647678));
- CHECK(kfr::coth(pack(2)) == pack(fbase(1.0373147207275480958778097647678)));
-
- testo::epsilon<float>() *= 10.0;
- testo::epsilon<double>() *= 10.0;
-
- CHECK(kfr::tan(2) == fbase(-2.1850398632615189916433061023137));
- CHECK(kfr::tan(pack(2)) == pack(fbase(-2.1850398632615189916433061023137)));
- CHECK(kfr::tandeg(2) == fbase(0.03492076949174773050040262577373));
- CHECK(kfr::tandeg(pack(2)) == pack(fbase(0.03492076949174773050040262577373)));
-
- testo::epsilon<float>() *= 10.0;
- testo::epsilon<double>() *= 10.0;
-
- CHECK(kfr::note_to_hertz(60) == fbase(261.6255653005986346778499935233));
- CHECK(kfr::note_to_hertz(pack(60)) == pack(fbase(261.6255653005986346778499935233)));
-}
-
TEST(vec_matrix)
{
using i32x2x2 = vec<vec<int, 2>, 2>;
@@ -293,6 +289,7 @@ TEST(test_delay)
CHECK(v3[3] == 100);
CHECK(v3[4] == 101);
CHECK(v3[19] == 116);
+
}
int main(int argc, char** argv) { return testo::run_all("", true); }
