kfr

commit a00d2e42928a1162cf43c291af48a9347ef447b8
parent af9b271f29828d85eba212cb0dd6a822ab6d45d8
Author: [email protected] <[email protected]>
Date:   Mon, 25 Jul 2016 13:53:52 +0300

Code formatting

Diffstat:
M
include/kfr/base/atan.hpp
 | 
2
+-
M
include/kfr/base/log_exp.hpp
 | 
6
+-----
M
include/kfr/base/operators.hpp
 | 
1
-
M
include/kfr/base/select.hpp
 | 
6
+++---
M
include/kfr/dsp/resample.hpp
 | 
10
++++------
M
include/kfr/math.hpp
 | 
1
-
M
tests/CMakeLists.txt
 | 
3
++-
M
tests/basic_vector_test.cpp
 | 
6
++----
M
tests/complex_test.cpp
 | 
1
-

9 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/include/kfr/base/atan.hpp b/include/kfr/base/atan.hpp
@@ -109,7 +109,7 @@ KFR_SINTRIN vec<f32, N> atan2(vec<f32, N> y, vec<f32, N> x)
     r                       = mulsign(r, x);
     r = select(isinf(x) || x == 0.0f, pi_over_2 - select(x.asmask(), mulsign(pi_over_2, x), 0.0f), r);
     r = select(isinf(y), pi_over_2 - select(x.asmask(), mulsign(pi_over_4, x), 0.0f), r);
-    r = select(y == 0.0f, fbitcast(ibitcast(x <  0) & ibitcast(pi)), r);
+    r = select(y == 0.0f, fbitcast(ibitcast(x < 0) & ibitcast(pi)), r);
     r = fbitcast(ibitcast(isnan(x) || isnan(y)) | ibitcast(mulsign(r, y)));
     return r;
 }
diff --git a/include/kfr/base/log_exp.hpp b/include/kfr/base/log_exp.hpp
@@ -23,10 +23,10 @@
 #pragma once
 
 #include "abs.hpp"
+#include "clamp.hpp"
 #include "constants.hpp"
 #include "function.hpp"
 #include "min_max.hpp"
-#include "clamp.hpp"
 #include "operators.hpp"
 #include "round.hpp"
 #include "select.hpp"
@@ -508,8 +508,4 @@ KFR_INTRIN expr_func<internal::fn_cbrt, E1> cbrt(E1&& x)
 {
     return { {}, std::forward<E1>(x) };
 }
-
-
-
-
 }
diff --git a/include/kfr/base/operators.hpp b/include/kfr/base/operators.hpp
@@ -661,7 +661,6 @@ KFR_INLINE vec<T, N> negodd(const vec<T, N>& x)
     return x ^ broadcast<N>(T(), -T());
 }
 
-
 #define KFR_EXPR_UNARY(fn, op)                                                                               \
     template <typename A1, KFR_ENABLE_IF(is_input_expression<A1>::value)>                                    \
     KFR_INLINE auto operator op(A1&& a1)->decltype(bind_expression(fn(), std::forward<A1>(a1)))              \
diff --git a/include/kfr/base/select.hpp b/include/kfr/base/select.hpp
@@ -82,13 +82,13 @@ KFR_SINTRIN vec<T, N> select(mask<T, N> m, vec<T, N> x, vec<T, N> y)
 KFR_I_FN(select)
 }
 
-template <typename T1, size_t N, typename T2, typename T3,
-          KFR_ENABLE_IF(is_numeric_args<T1, T2, T3>::value),
+template <typename T1, size_t N, typename T2, typename T3, KFR_ENABLE_IF(is_numeric_args<T1, T2, T3>::value),
           typename Tout = subtype<common_type<T2, T3>>>
 KFR_INTRIN vec<Tout, N> select(const mask<T1, N>& m, const T2& x, const T3& y)
 {
     static_assert(sizeof(T1) == sizeof(Tout), "select: incompatible types");
-    return internal::select(bitcast<Tout>(m).asmask(), static_cast<vec<Tout, N>>(x), static_cast<vec<Tout, N>>(y));
+    return internal::select(bitcast<Tout>(m).asmask(), static_cast<vec<Tout, N>>(x),
+                            static_cast<vec<Tout, N>>(y));
 }
 
 template <typename E1, typename E2, typename E3, KFR_ENABLE_IF(is_input_expressions<E1, E2, E3>::value)>
diff --git a/include/kfr/dsp/resample.hpp b/include/kfr/dsp/resample.hpp
@@ -201,13 +201,11 @@ struct resampler
 }
 
 template <typename T, size_t quality>
-inline internal::resampler<T, quality> resampler(csize_t<quality>,
-                                                                  size_t interpolation_factor,
-                                                                  size_t decimation_factor, T scale = T(1),
-                                                                  T cutoff = 0.49)
+inline internal::resampler<T, quality> resampler(csize_t<quality>, size_t interpolation_factor,
+                                                 size_t decimation_factor, T scale = T(1), T cutoff = 0.49)
 {
     using itype = typename internal::resampler<T, quality>::itype;
-    return internal::resampler<T, quality>(itype(interpolation_factor),
-                                                            itype(decimation_factor), scale, cutoff);
+    return internal::resampler<T, quality>(itype(interpolation_factor), itype(decimation_factor), scale,
+                                           cutoff);
 }
 }
diff --git a/include/kfr/math.hpp b/include/kfr/math.hpp
@@ -44,4 +44,3 @@
 #include "base/sin_cos.hpp"
 #include "base/sqrt.hpp"
 #include "base/tan.hpp"
-
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -52,4 +52,4 @@ add_test(NAME stat_test
         COMMAND ${PROJECT_BINARY_DIR}/tests/stat_test)
 add_test(NAME dft_test
         COMMAND ${PROJECT_BINARY_DIR}/tests/dft_test)
-        
+        
+\ No newline at end of file
diff --git a/tests/basic_vector_test.cpp b/tests/basic_vector_test.cpp
@@ -90,13 +90,11 @@ TEST(test)
 
     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 });
+    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 });
+    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*/)
diff --git a/tests/complex_test.cpp b/tests/complex_test.cpp
@@ -22,7 +22,6 @@ void assert_is_same()
     static_assert(std::is_same<T1, T2>::value, "");
 }
 
-
 TEST(complex_vector)
 {
     const vec<c32, 1> c32x1{ c32{ 0, 1 } };