coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-26 20:38:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added etl::multi_array

Browse Source
This commit is contained in:
John Wellbelove 2019-04-27 15:51:13 +01:00
parent 2b5fe55540
commit 8354de78e1
6 changed files with 510 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/etl/multi_array.h
View File

@ -40,7 +40,6 @@ SOFTWARE.
namespace etl
{
#if ETL_CPP11_SUPPORTED
namespace private_multi_array
@ -48,25 +47,20 @@ namespace etl
template <class T, size_t D1, size_t... Dx>
struct multi_array_t
{
using ArrayX = typename multi_array_t<T, Dx...>::type;
using type = etl::array<ArrayX, D1>;
using type = etl::array<typename multi_array_t<T, Dx...>::type, D1>;
static constexpr size_t SIZE = D1;
};
template <class T, size_t D1>
struct multi_array_t<T, D1>
{
using type = etl::array<T, D1>;
static constexpr size_t SIZE = D1;
};
}
template <class T, size_t D1, size_t... Dx>
using multi_array = private_multi_array::multi_array_t<T, D1, Dx...>;
template <typename T, size_t D1, size_t D2>
using array2d = etl::multi_array<T, D1, D2>;
template <typename T, size_t D1, size_t D2, size_t D3>
using array3d = etl::multi_array<T, D1, D2, D3>;
template <typename T, const size_t D1, const size_t... Dx>
using multi_array = typename private_multi_array::multi_array_t<T, D1, Dx...>::type;
#endif
}

2
include/etl/version.h
View File

@ -38,7 +38,7 @@ SOFTWARE.
///\ingroup utilities
#define ETL_VERSION_MAJOR 14
#define ETL_VERSION_MINOR 19
#define ETL_VERSION_MINOR 20
#define ETL_VERSION_PATCH 0
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) ETL_STRINGIFY(ETL_VERSION_MINOR) ETL_STRINGIFY(ETL_VERSION_PATCH)

5
support/Release notes.txt
View File

@ -1,3 +1,8 @@
===============================================================================
14.20.0
Added etl::multi_array for multi-dimensional arrays.
C++11 only.
===============================================================================
14.19.0
Added 'emplace' to etl::optional.

495
test/test_multi_array.cpp Normal file
View File

@ -0,0 +1,495 @@
/******************************************************************************
The MIT License(MIT)
Embedded Template Library.
https://github.com/ETLCPP/etl
https://www.etlcpp.com
Copyright(c) 2019 jwellbelove
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files(the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
******************************************************************************/
#include "UnitTest++.h"
#include "etl/array.h"
#include "etl/multi_array.h"
#include <array>
#include <algorithm>
#include <iterator>
#include "etl/integral_limits.h"
namespace
{
SUITE(test_array)
{
static const size_t SIZE1 = 4;
static const size_t SIZE2 = 3;
int data1[4][3] = { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } };
using Data = etl::multi_array<int, SIZE1, SIZE2>;
using Compare_Data = std::array<std::array<int, SIZE2>, SIZE1>;
Compare_Data compare_data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Compare_Data swap_data = { { { 12, 13, 14 }, { 15, 16, 17 }, { 18, 19, 20 }, { 21, 22, 23 } } };
//*************************************************************************
TEST(test_constructor)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
CHECK_EQUAL(data.size(), SIZE1);
CHECK_EQUAL(data.max_size(), SIZE1);
CHECK_EQUAL(data[0].size(), SIZE2);
CHECK_EQUAL(data[0].max_size(), SIZE2);
}
//*************************************************************************
TEST(test_assignment)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data other_data;
other_data = data;
bool isEqual = std::equal(data.begin(), data.end(), other_data.begin());
CHECK(isEqual);
}
//*************************************************************************
TEST(test_at)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
for (size_t i = 0; i < data.size(); ++i)
{
for (size_t j = 0; j < data[0].size(); ++j)
{
CHECK_EQUAL(data[i].at(j), compare_data[i].at(j));
}
}
CHECK_THROW(data.at(data.size()), etl::array_out_of_range);
CHECK_THROW(data[0].at(data[0].size()), etl::array_out_of_range);
}
//*************************************************************************
TEST(test_at_const)
{
const Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
for (size_t i = 0; i < data.size(); ++i)
{
for (size_t j = 0; j < data[0].size(); ++j)
{
CHECK_EQUAL(data[i].at(j), compare_data[i].at(j));
}
CHECK_THROW(data.at(data.size()), etl::array_out_of_range);
}
}
//*************************************************************************
TEST(test_index_operator)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
for (size_t i = 0; i < data.size(); ++i)
{
for (size_t j = 0; j < data[0].size(); ++j)
{
CHECK_EQUAL(data[i][j], compare_data[i][j]);
}
}
}
//*************************************************************************
TEST(test_index_operator_const)
{
const Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
for (size_t i = 0; i < data.size(); ++i)
{
for (size_t j = 0; j < data[0].size(); ++j)
{
CHECK_EQUAL(data[i][j], compare_data[i][j]);
}
}
}
//*************************************************************************
TEST(test_front)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
int& ref = data.front().front();
CHECK(ref == compare_data.front().front());
}
//*************************************************************************
TEST(test_front_const)
{
const Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
const int& ref = data.front().front();
CHECK(ref == compare_data.front().front());
}
//*************************************************************************
TEST(test_back)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
int& ref = data.back().back();
CHECK(ref == compare_data.back().back());
}
//*************************************************************************
TEST(test_back_const)
{
const Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
const int& ref = data.back().back();
CHECK(ref == compare_data.back().back());
}
//*************************************************************************
TEST(test_data)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
bool isEqual = std::equal(data.begin(), data.end(), data.data());
CHECK(isEqual);
}
//*************************************************************************
TEST(test_data_const)
{
const Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
bool isEqual = std::equal(data.begin(), data.end(), data.data());
CHECK(isEqual);
}
//*************************************************************************
TEST(test_begin)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
CHECK(data.begin() == &data[0]);
CHECK(data[0].begin() == &data[0][0]);
CHECK(data[1].begin() == &data[1][0]);
CHECK(data[2].begin() == &data[2][0]);
CHECK(data[3].begin() == &data[3][0]);
}
//*************************************************************************
TEST(test_end)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
CHECK(data.end() == &data[SIZE1]);
CHECK(data[0].end() == &data[0][SIZE2]);
CHECK(data[1].end() == &data[1][SIZE2]);
CHECK(data[2].end() == &data[2][SIZE2]);
CHECK(data[3].end() == &data[3][SIZE2]);
}
//*************************************************************************
TEST(test_cbegin)
{
const Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
CHECK(data.cbegin() == &data[0]);
CHECK(data[0].cbegin() == &data[0][0]);
CHECK(data[1].cbegin() == &data[1][0]);
CHECK(data[2].cbegin() == &data[2][0]);
CHECK(data[3].cbegin() == &data[3][0]);
}
//*************************************************************************
TEST(test_cend)
{
const Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
CHECK(data.cend() == &data[SIZE1]);
CHECK(data[0].cend() == &data[0][SIZE2]);
CHECK(data[1].cend() == &data[1][SIZE2]);
CHECK(data[2].cend() == &data[2][SIZE2]);
CHECK(data[3].cend() == &data[3][SIZE2]);
}
//*************************************************************************
TEST(test_rbegin)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
typedef etl::multi_array<int, SIZE2> Inner;
CHECK(data.rbegin() == Data::reverse_iterator(&data[SIZE1]));
CHECK(data[0].rbegin() == Inner::reverse_iterator(&data[0][SIZE2]));
CHECK(data[1].rbegin() == Inner::reverse_iterator(&data[1][SIZE2]));
CHECK(data[2].rbegin() == Inner::reverse_iterator(&data[2][SIZE2]));
CHECK(data[3].rbegin() == Inner::reverse_iterator(&data[3][SIZE2]));
}
//*************************************************************************
TEST(test_rend)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
typedef etl::multi_array<int, SIZE2> Inner;
CHECK(data.rend() == Data::reverse_iterator(&data[0]));
CHECK(data[0].rend() == Inner::reverse_iterator(&data[0][0]));
CHECK(data[1].rend() == Inner::reverse_iterator(&data[1][0]));
CHECK(data[2].rend() == Inner::reverse_iterator(&data[2][0]));
CHECK(data[3].rend() == Inner::reverse_iterator(&data[3][0]));
}
//*************************************************************************
TEST(test_crbegin)
{
const Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
typedef etl::multi_array<int, SIZE2> Inner;
CHECK(data.rbegin() == Data::const_reverse_iterator(&data[SIZE1]));
CHECK(data[0].rbegin() == Inner::const_reverse_iterator(&data[0][SIZE2]));
CHECK(data[1].rbegin() == Inner::const_reverse_iterator(&data[1][SIZE2]));
CHECK(data[2].rbegin() == Inner::const_reverse_iterator(&data[2][SIZE2]));
CHECK(data[3].rbegin() == Inner::const_reverse_iterator(&data[3][SIZE2]));
}
//*************************************************************************
TEST(test_crend)
{
const Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
typedef etl::multi_array<int, SIZE2> Inner;
CHECK(data.rend() == Data::const_reverse_iterator(&data[0]));
CHECK(data[0].rend() == Inner::const_reverse_iterator(&data[0][0]));
CHECK(data[1].rend() == Inner::const_reverse_iterator(&data[1][0]));
CHECK(data[2].rend() == Inner::const_reverse_iterator(&data[2][0]));
CHECK(data[3].rend() == Inner::const_reverse_iterator(&data[3][0]));
}
//*************************************************************************
TEST(test_empty)
{
Data data;
CHECK(!data.empty());
CHECK(!data[0].empty());
}
//*************************************************************************
TEST(test_size)
{
Data data;
CHECK_EQUAL(SIZE1, data.size());
CHECK_EQUAL(SIZE2, data[0].size());
CHECK_EQUAL(SIZE1, data.SIZE);
CHECK_EQUAL(SIZE2, data[0].SIZE);
}
//*************************************************************************
TEST(test_max_size)
{
Data data;
CHECK_EQUAL(SIZE1, data.max_size());
CHECK_EQUAL(SIZE2, data[0].max_size());
}
//*************************************************************************
TEST(test_fill)
{
Data data;
typedef etl::multi_array<int, SIZE2> Inner;
const Inner fillData = { { 12, 13, 14 } };
data.fill(fillData);
CHECK(fillData == data[0]);
CHECK(fillData == data[1]);
CHECK(fillData == data[2]);
CHECK(fillData == data[3]);
}
//*************************************************************************
TEST(test_swap)
{
Data data1 = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data data2 = { { { 12, 13, 14 }, { 15, 16, 17 }, { 18, 19, 20 }, { 21, 22, 23 } } };
Data data1b = { { { 12, 13, 14 }, { 15, 16, 17 }, { 18, 19, 20 }, { 21, 22, 23 } } };
Data data2b = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
swap(data1, data2);
CHECK(std::equal(data1b.begin(), data1b.end(), data1.begin()));
CHECK(std::equal(data2b.begin(), data2b.end(), data2.begin()));
}
//*************************************************************************
TEST(test_assign)
{
Data initial = { { { -1, -1, -1 }, { -1, -1, -1 }, { -1, -1, -1 }, { -1, -1, -1 } } };
Data source = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data check1 = { { { 0, 1, 2 }, { 3, 4, 5 }, { -1, -1, -1 }, { -1, -1, -1 } } };
Data check2 = { { { 0, 1, 2 }, { 3, 4, 5 }, { 99, 99, 99 }, { 99, 99, 99 } } };
Data check3 = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
typedef etl::multi_array<int, SIZE2> Inner;
const Inner ninetynine = { { 99, 99, 99 } };
Data data;
// Initial data.
data.assign(std::begin(initial), std::end(initial));
bool isEqual = std::equal(data.begin(), data.end(), std::begin(initial));
CHECK(isEqual);
// Assign smaller.
data.assign(std::begin(initial), std::end(initial));
data.assign(&source[0], &source[2]);
isEqual = std::equal(data.begin(), data.end(), std::begin(check1));
CHECK(isEqual);
// Assign smaller + default.
data.assign(std::begin(initial), std::end(initial));
data.assign(&source[0], &source[2], ninetynine);
isEqual = std::equal(data.begin(), data.end(), std::begin(check2));
CHECK(isEqual);
}
//*************************************************************************
TEST(test_insert_value)
{
Data initial = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data check1 = { { { 12, 13, 14 }, { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 } } };
Data check2 = { { { 0, 1, 2 }, { 12, 13, 14 }, { 3, 4, 5 }, { 6, 7, 8 } } };
Data check3 = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 12, 13, 14 } } };
typedef etl::multi_array<int, SIZE2> Inner;
const Inner inserted = { { 12, 13, 14 } };
Data data;
Data::iterator result;
// Insert beginning.
data.assign(std::begin(initial), std::end(initial));
result = data.insert_at(0, inserted);
CHECK(data[0] == *result);
bool isEqual = std::equal(data.begin(), data.end(), check1.begin());
CHECK(isEqual);
// Insert middle.
data.assign(std::begin(initial), std::end(initial));
result = data.insert_at(1, inserted);
CHECK(data[1] == *result);
isEqual = std::equal(data.begin(), data.end(), check2.begin());
CHECK(isEqual);
// Insert end.
data.assign(std::begin(initial), std::end(initial));
result = data.insert_at(3, inserted);
CHECK(data[3] == *result);
isEqual = std::equal(data.begin(), data.end(), check3.begin());
CHECK(isEqual);
}
//*************************************************************************
TEST(test_equal)
{
Data data1 = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data data2 = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
CHECK(data1 == data2);
}
//*************************************************************************
TEST(test_not_equal)
{
Data data1 = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data data2 = { { { 0, 1, 2 }, { 3, 4, 6 }, { 6, 7, 8 }, { 9, 10, 11 } } };
CHECK(data1 != data2);
}
//*************************************************************************
TEST(test_less_than)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data lesser = { { { 0, 1, 2 }, { 3, 4, 4 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data greater = { { { 0, 1, 2 }, { 3, 4, 6 }, { 6, 7, 8 }, { 9, 10, 11 } } };
CHECK(lesser < data);
CHECK(!(data < data));
CHECK(!(greater < data));
}
//*************************************************************************
TEST(test_less_than_equal)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data lesser = { { { 0, 1, 2 }, { 3, 4, 4 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data greater = { { { 0, 1, 2 }, { 3, 4, 6 }, { 6, 7, 8 }, { 9, 10, 11 } } };
CHECK(lesser <= data);
CHECK(data <= data);
CHECK(!(greater <= data));
}
//*************************************************************************
TEST(test_greater_than)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data lesser = { { { 0, 1, 2 }, { 3, 4, 4 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data greater = { { { 0, 1, 2 }, { 3, 4, 6 }, { 6, 7, 8 }, { 9, 10, 11 } } };
CHECK(greater > data);
CHECK(!(data > data));
CHECK(!(lesser > data));
}
//*************************************************************************
TEST(test_greater_than_equal)
{
Data data = { { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data lesser = { { { 0, 1, 2 }, { 3, 4, 4 }, { 6, 7, 8 }, { 9, 10, 11 } } };
Data greater = { { { 0, 1, 2 }, { 3, 4, 6 }, { 6, 7, 8 }, { 9, 10, 11 } } };
CHECK(greater >= data);
CHECK(data >= data);
CHECK(!(lesser >= data));
}
};
}

1
test/vs2017/etl.vcxproj
View File

@ -585,6 +585,7 @@
<ClCompile Include="..\test_forward_list_shared_pool.cpp" />
<ClCompile Include="..\test_bit_stream.cpp" />
<ClCompile Include="..\test_list_shared_pool.cpp" />
<ClCompile Include="..\test_multi_array.cpp" />
<ClCompile Include="..\test_no_stl_algorithm.cpp" />
<ClCompile Include="..\test_array.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../unittest-cpp</AdditionalIncludeDirectories>

3
test/vs2017/etl.vcxproj.filters
View File

@ -1217,6 +1217,9 @@
<ClCompile Include="..\test_to_u32string.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\test_multi_array.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\library.properties">