Add min/max functions
This commit is contained in:
parent
eaeac13e14
commit
4f47a24478
4 changed files with 126 additions and 0 deletions
|
@ -34,6 +34,23 @@ namespace vwr {
|
|||
template <typename V1, typename V2>
|
||||
Vec<typename std::common_type<V1, V2>::type> cross ( const Vec<V1, 3>& parLeft, const Vec<V2, 3>& parRight );
|
||||
|
||||
template <typename V1, typename V2, size_type S>
|
||||
Vec<typename std::common_type<V1, V2>::type> min ( const Vec<V1, S>& parLeft, const Vec<V2, S>& parRight );
|
||||
template <typename V1, typename V2, size_type S>
|
||||
Vec<typename std::common_type<V1, V2>::type> max ( const Vec<V1, S>& parLeft, const Vec<V2, S>& parRight );
|
||||
|
||||
namespace implem {
|
||||
template <typename V1, typename V2, size_type S, size_type... Indices>
|
||||
inline Vec<typename std::common_type<V1, V2>::type> min ( bt::number_seq<size_type, Indices...>, const Vec<V1, S>& parLeft, const Vec<V2, S>& parRight ) {
|
||||
return {parLeft[Indices] < parRight[Indices] ? parLeft[Indices] : parRight[Indices]...};
|
||||
}
|
||||
|
||||
template <typename V1, typename V2, size_type S, size_type... Indices>
|
||||
inline Vec<typename std::common_type<V1, V2>::type> max ( bt::number_seq<size_type, Indices...>, const Vec<V1, S>& parLeft, const Vec<V2, S>& parRight ) {
|
||||
return {parLeft[Indices] < parRight[Indices] ? parRight[Indices] : parLeft[Indices]...};
|
||||
}
|
||||
} //namespace implem
|
||||
|
||||
template <typename V1, typename V2, size_type S>
|
||||
inline typename std::common_type<typename Vec<V1>::scalar_type, typename Vec<V2>::scalar_type>::type dot (const Vec<V1, S>& parLeft, const Vec<V2, S>& parRight) {
|
||||
auto retval = parLeft.x() * parRight.x();
|
||||
|
@ -55,6 +72,16 @@ namespace vwr {
|
|||
parLeft.x() * parRight.y() - parLeft.y() * parRight.x()
|
||||
);
|
||||
}
|
||||
|
||||
template <typename V1, typename V2, size_type S>
|
||||
inline Vec<typename std::common_type<V1, V2>::type> min ( const Vec<V1, S>& parLeft, const Vec<V2, S>& parRight ) {
|
||||
return implem::min(bt::number_range<size_type, 0, S>(), parLeft, parRight);
|
||||
}
|
||||
|
||||
template <typename V1, typename V2, size_type S>
|
||||
inline Vec<typename std::common_type<V1, V2>::type> max ( const Vec<V1, S>& parLeft, const Vec<V2, S>& parRight ) {
|
||||
return implem::max(bt::number_range<size_type, 0, S>(), parLeft, parRight);
|
||||
}
|
||||
} //namespace vwr
|
||||
|
||||
#if defined VWR_OUTER_NAMESPACE
|
||||
|
|
|
@ -10,6 +10,7 @@ add_executable(${PROJECT_NAME}
|
|||
test_sequence_range.cpp
|
||||
test_offset_getters.cpp
|
||||
test_custom_type.cpp
|
||||
test_min_max.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
|
|
|
@ -9,6 +9,7 @@ exec_target = executable(meson.project_name(),
|
|||
'test_sequence_range.cpp',
|
||||
'test_offset_getters.cpp',
|
||||
'test_custom_type.cpp',
|
||||
'test_min_max.cpp',
|
||||
install: false,
|
||||
dependencies: [gtest_dep, vectorwrapper_dep],
|
||||
cpp_args: compiler_opts,
|
||||
|
|
97
test/unit/test_min_max.cpp
Normal file
97
test/unit/test_min_max.cpp
Normal file
|
@ -0,0 +1,97 @@
|
|||
/*
|
||||
* Copyright 2015-2017 Michele "King_DuckZ" Santullo
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "vectorwrapper/vectorops.hpp"
|
||||
#include "sample_vectors.hpp"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
TEST(vwr, min) {
|
||||
using namespace vwr;
|
||||
|
||||
{
|
||||
ivec3 a(1, 2, 3);
|
||||
ivec3 b(0, 4, 3);
|
||||
ivec3 c = min(a, b);
|
||||
EXPECT_EQ(0, c.x());
|
||||
EXPECT_EQ(2, c.y());
|
||||
EXPECT_EQ(3, c.z());
|
||||
}
|
||||
|
||||
{
|
||||
ivec3 a(-2, -3, -4);
|
||||
ivec3 b(100);
|
||||
ivec3 c = min(a, b);
|
||||
EXPECT_EQ(-2, c.x());
|
||||
EXPECT_EQ(-3, c.y());
|
||||
EXPECT_EQ(-4, c.z());
|
||||
}
|
||||
|
||||
{
|
||||
ivec3 a(100);
|
||||
ivec3 b(-1000, -1100, -1200);
|
||||
ivec3 c = min(a, b);
|
||||
EXPECT_EQ(-1000, c.x());
|
||||
EXPECT_EQ(-1100, c.y());
|
||||
EXPECT_EQ(-1200, c.z());
|
||||
}
|
||||
|
||||
{
|
||||
ivec3 a(-20, 30, -40);
|
||||
ivec3 b(a);
|
||||
ivec3 c = min(a, b);
|
||||
EXPECT_EQ(-20, c.x());
|
||||
EXPECT_EQ(30, c.y());
|
||||
EXPECT_EQ(-40, c.z());
|
||||
}
|
||||
}
|
||||
|
||||
TEST(vwr, max) {
|
||||
using namespace vwr;
|
||||
{
|
||||
ivec2 a(1, 2);
|
||||
ivec2 b(0, 4);
|
||||
ivec2 c = max(a, b);
|
||||
EXPECT_EQ(1, c.x());
|
||||
EXPECT_EQ(4, c.y());
|
||||
}
|
||||
|
||||
{
|
||||
ivec3 a(2, 3, 4);
|
||||
ivec3 b(-100);
|
||||
ivec3 c = max(a, b);
|
||||
EXPECT_EQ(2, c.x());
|
||||
EXPECT_EQ(3, c.y());
|
||||
EXPECT_EQ(4, c.z());
|
||||
}
|
||||
|
||||
{
|
||||
ivec3 a(-100);
|
||||
ivec3 b(1000, 1100, 1200);
|
||||
ivec3 c = max(a, b);
|
||||
EXPECT_EQ(1000, c.x());
|
||||
EXPECT_EQ(1100, c.y());
|
||||
EXPECT_EQ(1200, c.z());
|
||||
}
|
||||
|
||||
{
|
||||
ivec3 a(20, -30, 40);
|
||||
ivec3 b(a);
|
||||
ivec3 c = max(a, b);
|
||||
EXPECT_EQ(20, c.x());
|
||||
EXPECT_EQ(-30, c.y());
|
||||
EXPECT_EQ(40, c.z());
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue