Resolve "[API-#2] Pseudo-privatization of rotgen entity member functions"
Closes #18 Co-authored-by: Jules Pénuchot <jules@penuchot.com> See merge request oss/rotgen!50
This commit is contained in:
parent
6489697c05
commit
e151e136d6
52 changed files with 2212 additions and 1556 deletions
|
|
@ -14,34 +14,34 @@ TTS_CASE_TPL("Chains of extraction", rotgen::tests::types)
|
|||
<typename T, typename O>(tts::type<tts::types<T, O>>)
|
||||
{
|
||||
constexpr int N = 8;
|
||||
auto a = rotgen::matrix<T, N, N, O::value>::Random();
|
||||
auto a = rotgen::setRandom<rotgen::matrix<T, N, N, O::value>>();
|
||||
|
||||
auto b = topLeftCorner(a, 5, 5);
|
||||
TTS_EQUAL(b.startRow(), 0);
|
||||
TTS_EQUAL(b.startCol(), 0);
|
||||
TTS_EQUAL(startRow(b), 0);
|
||||
TTS_EQUAL(startCol(b), 0);
|
||||
setConstant(b, -7);
|
||||
|
||||
for (rotgen::Index r = 0; r < 5; r++)
|
||||
for (rotgen::Index c = 0; c < 5; c++) TTS_EQUAL(a(r, c), -7);
|
||||
|
||||
auto bb = bottomRightCorner(b, 3, 3);
|
||||
TTS_EQUAL(bb.startRow(), 2);
|
||||
TTS_EQUAL(bb.startCol(), 2);
|
||||
TTS_EQUAL(startRow(bb), 2);
|
||||
TTS_EQUAL(startCol(bb), 2);
|
||||
setConstant(bb, 42);
|
||||
|
||||
for (rotgen::Index r = 2; r < 5; r++)
|
||||
for (rotgen::Index c = 2; c < 5; c++) TTS_EQUAL(a(r, c), 42);
|
||||
|
||||
auto bbb = row(bb, 1);
|
||||
TTS_EQUAL(bbb.startRow(), 1);
|
||||
TTS_EQUAL(bbb.startCol(), 0);
|
||||
TTS_EQUAL(startRow(bbb), 1);
|
||||
TTS_EQUAL(startCol(bbb), 0);
|
||||
setConstant(bbb, 99.5);
|
||||
|
||||
for (rotgen::Index c = 3; c < 5; c++) TTS_EQUAL(a(3, c), 99.5);
|
||||
|
||||
auto bbbb = col(bbb, 1);
|
||||
TTS_EQUAL(bbbb.startRow(), 0);
|
||||
TTS_EQUAL(bbbb.startCol(), 1);
|
||||
TTS_EQUAL(startRow(bbbb), 0);
|
||||
TTS_EQUAL(startCol(bbbb), 1);
|
||||
setConstant(bbbb, 0.125);
|
||||
|
||||
TTS_EQUAL(a(3, 3), 0.125);
|
||||
|
|
@ -94,7 +94,7 @@ TTS_CASE("Compound operators on extractions")
|
|||
setConstant(n, 10);
|
||||
setConstant(reference, 10);
|
||||
|
||||
for (int i = 0; i < m.cols(); i++) process_col(m, n, i);
|
||||
for (int i = 0; i < cols(m); i++) process_col(m, n, i);
|
||||
|
||||
TTS_EQUAL(m, reference);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,29 +10,29 @@
|
|||
#include "unit/tests.hpp"
|
||||
#include <iostream>
|
||||
|
||||
TTS_CASE_TPL("outer_stride<0> interactions",
|
||||
rotgen::tests::types)<typename T, typename O>(
|
||||
tts::type<tts::types<T, O>>)
|
||||
TTS_CASE_TPL("outer_stride<0> interactions", rotgen::tests::types)
|
||||
|
||||
<typename T, typename O>(tts::type<tts::types<T, O>>)
|
||||
{
|
||||
using mat_t = rotgen::matrix<T, rotgen::Dynamic, rotgen::Dynamic, O::value>;
|
||||
|
||||
T contiguous[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<0>> m(&contiguous[0], 4, 3);
|
||||
|
||||
TTS_EQUAL(m.innerStride(), 1);
|
||||
TTS_EQUAL(m.outerStride(), O::value == rotgen::ColMajor ? 4 : 3);
|
||||
TTS_EQUAL(innerStride(m), 1);
|
||||
TTS_EQUAL(outerStride(m), O::value == rotgen::ColMajor ? 4 : 3);
|
||||
|
||||
if constexpr (O::value == rotgen::ColMajor)
|
||||
{
|
||||
T padded[] = {1, 2, 3, 4, 99, 5, 6, 7, 8, 99, 9, 10, 11, 12};
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<5>> sp(&padded[0], 4, 3);
|
||||
TTS_EQUAL(sp.innerStride(), 1);
|
||||
TTS_EQUAL(sp.outerStride(), 5);
|
||||
TTS_EQUAL(innerStride(sp), 1);
|
||||
TTS_EQUAL(outerStride(sp), 5);
|
||||
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<>> dp(&padded[0], 4, 3,
|
||||
rotgen::outer_stride(5));
|
||||
TTS_EQUAL(dp.innerStride(), 1);
|
||||
TTS_EQUAL(dp.outerStride(), 5);
|
||||
TTS_EQUAL(innerStride(dp), 1);
|
||||
TTS_EQUAL(outerStride(dp), 5);
|
||||
|
||||
TTS_EQUAL(m, sp);
|
||||
TTS_EQUAL(m, dp);
|
||||
|
|
@ -42,13 +42,13 @@ TTS_CASE_TPL("outer_stride<0> interactions",
|
|||
{
|
||||
T padded[] = {1, 2, 3, 99, 4, 5, 6, 99, 7, 8, 9, 99, 10, 11, 12};
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<4>> sp(&padded[0], 4, 3);
|
||||
TTS_EQUAL(sp.innerStride(), 1);
|
||||
TTS_EQUAL(sp.outerStride(), 4);
|
||||
TTS_EQUAL(innerStride(sp), 1);
|
||||
TTS_EQUAL(outerStride(sp), 4);
|
||||
|
||||
rotgen::map<mat_t, 0, rotgen::outer_stride<>> dp(&padded[0], 4, 3,
|
||||
rotgen::outer_stride(4));
|
||||
TTS_EQUAL(dp.innerStride(), 1);
|
||||
TTS_EQUAL(dp.outerStride(), 4);
|
||||
TTS_EQUAL(innerStride(dp), 1);
|
||||
TTS_EQUAL(outerStride(dp), 4);
|
||||
|
||||
TTS_EQUAL(m, sp);
|
||||
TTS_EQUAL(m, dp);
|
||||
|
|
|
|||
|
|
@ -48,9 +48,9 @@ auto process(column_ref<> v)
|
|||
|
||||
TTS_CASE("Reference of reference check")
|
||||
{
|
||||
auto v1 = rotgen::matrix<float, 1, 1>::Ones();
|
||||
auto v2 = rotgen::matrix<float, 2, 1>::Random();
|
||||
auto v3 = rotgen::matrix<float, 3, 1>::Constant(6.66);
|
||||
auto v1 = rotgen::setOnes<rotgen::matrix<float, 1, 1>>();
|
||||
auto v2 = rotgen::setRandom<rotgen::matrix<float, 2, 1>>();
|
||||
auto v3 = rotgen::setConstant<rotgen::matrix<float, 3, 1>>(6.66);
|
||||
|
||||
auto sum1 = v1(0);
|
||||
auto sum2 = v2(0) + v2(1);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue