codereckons/rotgen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ref(ref) constructors

Browse source 
See merge request oss/rotgen!29
This commit is contained in:
Joel Falcou 2025-09-28 17:33:57 +02:00
commit 9b597bf17f
2 changed files with 74 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/rotgen/common/ref.hpp
View file

@ -66,6 +66,8 @@ namespace rotgen
using parent::setConstant; using parent::setConstant;
using parent::setRandom; using parent::setRandom;
using parent::setIdentity; using parent::setIdentity;
using parent::outerStride;
using parent::innerStride;
using parent::operator=; using parent::operator=;
@ -99,6 +101,12 @@ namespace rotgen
static_assert((Ref::storage_order & 1) == storage_order, "ref: Incompatible storage layout"); static_assert((Ref::storage_order & 1) == storage_order, "ref: Incompatible storage layout");
} }
template<typename TT, int OO, typename SS>
ref ( ref<TT,OO,SS>& b )
requires(std::same_as<value_type, typename TT::value_type> && (TT::storage_order & 1) == storage_order)
: parent(b.data(), b.rows(), b.cols(), stride_type{b.outerStride(),b.innerStride()})
{}
ref(parent& m) : parent(m.data(), m.rows(), m.cols()) {} ref(parent& m) : parent(m.data(), m.rows(), m.cols()) {}
friend std::ostream& operator<<(std::ostream& os, ref const& r) friend std::ostream& operator<<(std::ostream& os, ref const& r)
@ -152,6 +160,8 @@ namespace rotgen
using parent::Constant; using parent::Constant;
using parent::Random; using parent::Random;
using parent::Identity; using parent::Identity;
using parent::outerStride;
using parent::innerStride;
using parent::operator=; using parent::operator=;
@ -178,6 +188,12 @@ namespace rotgen
: parent(b.data(), b.rows(), b.cols(), stride_type{b.outerStride(),b.innerStride()}) : parent(b.data(), b.rows(), b.cols(), stride_type{b.outerStride(),b.innerStride()})
{} {}
template<typename TT, int OO, typename SS>
ref ( ref<TT,OO,SS> const& b )
requires(std::same_as<value_type, typename TT::value_type> && (TT::storage_order & 1) == storage_order)
: parent(b.data(), b.rows(), b.cols(), stride_type{b.outerStride(),b.innerStride()})
{}
ref(parent const& m) : parent(m.data(), m.rows(), m.cols()) {} ref(parent const& m) : parent(m.data(), m.rows(), m.cols()) {}
friend std::ostream& operator<<(std::ostream& os, ref const& r) friend std::ostream& operator<<(std::ostream& os, ref const& r)

58
test/integration/ref_magic.cpp Normal file
View file

@ -0,0 +1,58 @@
//==================================================================================================
/*
ROTGEN - Runtime Overlay for Eigen
Copyright : CODE RECKONS
SPDX-License-Identifier: BSL-1.0
*/
//==================================================================================================
#include "unit/tests.hpp"
#include <rotgen/rotgen.hpp>
template<int size = rotgen::Dynamic, typename Scalar = float, int maxSize = size>
using column = rotgen::matrix<Scalar, size, 1, rotgen::ColMajor, maxSize, 1>;
template<int size = rotgen::Dynamic, typename Scalar = float>
using column_ref = rotgen::ref<column<size, Scalar>>;
template<int size = rotgen::Dynamic, typename Scalar = float>
using const_column_ref = rotgen::ref<column<size, Scalar> const>;
template<int N>
void process( column_ref<N> v )
{
v(0) = rotgen::sum(v);
}
auto process( column_ref<> v )
{
auto sz = v.size();
switch(sz)
{
case 1 : process<1>(v); break;
case 2 : process<2>(v); break;
case 3 : process<3>(v); break;
default: break;
}
return sz;
}
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 sum1 = v1(0);
auto sum2 = v2(0) + v2(1);
auto sum3 = v3(0) + v3(1) + v3(2);
TTS_EQUAL(process(v1), 1);
TTS_EQUAL(process(v2), 2);
TTS_EQUAL(process(v3), 3);
TTS_EQUAL(v1[0], sum1);
TTS_EQUAL(v2[0], sum2);
TTS_EQUAL(v3[0], sum3);
};