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

Make max/minCoeff templated on index type

Browse source 
See merge request oss/rotgen!23
This commit is contained in:
Joel Falcou 2025-09-18 15:08:11 +02:00
commit e7cf89a903
12 changed files with 157 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
include/rotgen/dynamic/block.hpp
View file

@ -195,6 +195,29 @@ namespace rotgen
return *this; return *this;
} }
auto minCoeff() const { return parent::minCoeff(); }
auto maxCoeff() const { return parent::maxCoeff(); }
template<std::integral IndexType>
auto minCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::minCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
template<std::integral IndexType>
auto maxCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::maxCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
static concrete_type Zero() static concrete_type Zero()
requires (Rows != -1 && Cols != -1) requires (Rows != -1 && Cols != -1)
{ {

23
include/rotgen/dynamic/map.hpp
View file

@ -181,6 +181,29 @@ namespace rotgen
return *this; return *this;
} }
auto minCoeff() const { return parent::minCoeff(); }
auto maxCoeff() const { return parent::maxCoeff(); }
template<std::integral IndexType>
auto minCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::minCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
template<std::integral IndexType>
auto maxCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::maxCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
static auto Zero() requires( requires {Ref::Zero();} ) static auto Zero() requires( requires {Ref::Zero();} )
{ {
return Ref::Zero(); return Ref::Zero();

23
include/rotgen/dynamic/matrix.hpp
View file

@ -175,6 +175,29 @@ namespace rotgen
return *this; return *this;
} }
auto minCoeff() const { return parent::minCoeff(); }
auto maxCoeff() const { return parent::maxCoeff(); }
template<std::integral IndexType>
auto minCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::minCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
template<std::integral IndexType>
auto maxCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::maxCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
static matrix Ones() requires (Rows != -1 && Cols != -1) static matrix Ones() requires (Rows != -1 && Cols != -1)
{ {
return parent::Ones(Rows, Cols); return parent::Ones(Rows, Cols);

26
include/rotgen/fixed/block.hpp
View file

@ -345,13 +345,35 @@ namespace rotgen
using parent::prod; using parent::prod;
using parent::mean; using parent::mean;
using parent::trace; using parent::trace;
using parent::maxCoeff;
using parent::minCoeff;
using parent::squaredNorm; using parent::squaredNorm;
using parent::norm; using parent::norm;
using parent::sum; using parent::sum;
using parent::data; using parent::data;
auto minCoeff() const { return parent::minCoeff(); }
auto maxCoeff() const { return parent::maxCoeff(); }
template<std::integral IndexType>
auto minCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::minCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
template<std::integral IndexType>
auto maxCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::maxCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
Index startRow() const { return base().startRow(); } Index startRow() const { return base().startRow(); }
Index startCol() const { return base().startCol(); } Index startCol() const { return base().startCol(); }

26
include/rotgen/fixed/map.hpp
View file

@ -268,11 +268,33 @@ namespace rotgen
using parent::mean; using parent::mean;
using parent::prod; using parent::prod;
using parent::trace; using parent::trace;
using parent::maxCoeff;
using parent::minCoeff;
using parent::norm; using parent::norm;
using parent::squaredNorm; using parent::squaredNorm;
auto minCoeff() const { return parent::minCoeff(); }
auto maxCoeff() const { return parent::maxCoeff(); }
template<std::integral IndexType>
auto minCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::minCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
template<std::integral IndexType>
auto maxCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::maxCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
template<int P> value_type lpNorm() const template<int P> value_type lpNorm() const
{ {
static_assert(P == 1 || P == 2 || P == Infinity); static_assert(P == 1 || P == 2 || P == Infinity);

26
include/rotgen/fixed/matrix.hpp
View file

@ -289,13 +289,35 @@ namespace rotgen
using parent::prod; using parent::prod;
using parent::mean; using parent::mean;
using parent::trace; using parent::trace;
using parent::maxCoeff;
using parent::minCoeff;
using parent::squaredNorm; using parent::squaredNorm;
using parent::norm; using parent::norm;
using parent::sum; using parent::sum;
using parent::data; using parent::data;
auto minCoeff() const { return parent::minCoeff(); }
auto maxCoeff() const { return parent::maxCoeff(); }
template<std::integral IndexType>
auto minCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::minCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
template<std::integral IndexType>
auto maxCoeff(IndexType* row, IndexType* col) const
{
Index r,c;
auto result = parent::maxCoeff(&r, &c);
*row = r;
*col = c;
return result;
}
matrix& setOnes() matrix& setOnes()
{ {
*this = parent::Ones(rows(),cols()); *this = parent::Ones(rows(),cols());

8
include/rotgen/functions.hpp
View file

@ -60,11 +60,15 @@ namespace rotgen
} }
auto minCoeff(concepts::entity auto const& arg) { return arg.minCoeff(); } auto minCoeff(concepts::entity auto const& arg) { return arg.minCoeff(); }
auto maxCoeff(concepts::entity auto const& arg, Index* row, Index* col)
template<std::integral IndexType>
auto maxCoeff(concepts::entity auto const& arg, IndexType* row, IndexType* col)
{ {
return arg.maxCoeff(row, col); return arg.maxCoeff(row, col);
} }
auto minCoeff(concepts::entity auto const& arg, Index* row, Index* col)
template<std::integral IndexType>
auto minCoeff(concepts::entity auto const& arg, IndexType* row, IndexType* col)
{ {
return arg.minCoeff(row, col); return arg.minCoeff(row, col);
} }

4
include/rotgen/impl/block_model.hpp
View file

@ -66,8 +66,8 @@ class ROTGEN_EXPORT CLASSNAME
TYPE trace() const; TYPE trace() const;
TYPE maxCoeff() const; TYPE maxCoeff() const;
TYPE minCoeff() const; TYPE minCoeff() const;
TYPE maxCoeff(std::ptrdiff_t* row, std::ptrdiff_t* col) const; TYPE maxCoeff(Index* row, Index* col) const;
TYPE minCoeff(std::ptrdiff_t* row, std::ptrdiff_t* col) const; TYPE minCoeff(Index* row, Index* col) const;
TYPE squaredNorm() const; TYPE squaredNorm() const;
TYPE norm() const; TYPE norm() const;

4
include/rotgen/impl/matrix_model.hpp
View file

@ -53,8 +53,8 @@ class ROTGEN_EXPORT CLASSNAME
TYPE trace() const; TYPE trace() const;
TYPE maxCoeff() const; TYPE maxCoeff() const;
TYPE minCoeff() const; TYPE minCoeff() const;
TYPE maxCoeff(std::ptrdiff_t* row, std::ptrdiff_t* col) const; TYPE maxCoeff(Index* row, Index* col) const;
TYPE minCoeff(std::ptrdiff_t* row, std::ptrdiff_t* col) const; TYPE minCoeff(Index* row, Index* col) const;
TYPE squaredNorm() const; TYPE squaredNorm() const;
TYPE norm() const; TYPE norm() const;

4
src/block_model.cpp
View file

@ -331,14 +331,14 @@ struct CLASSNAME::payload
return val; return val;
} }
TYPE CLASSNAME::minCoeff(std::ptrdiff_t* row, std::ptrdiff_t* col) const TYPE CLASSNAME::minCoeff(Index* row, Index* col) const
{ {
TYPE val{}; TYPE val{};
storage_->apply([&](const auto& blk) { val = blk.minCoeff(row, col); }); storage_->apply([&](const auto& blk) { val = blk.minCoeff(row, col); });
return val; return val;
} }
TYPE CLASSNAME::maxCoeff(std::ptrdiff_t* row, std::ptrdiff_t* col) const TYPE CLASSNAME::maxCoeff(Index* row, Index* col) const
{ {
TYPE val{}; TYPE val{};
storage_->apply([&](const auto& blk) { val = blk.maxCoeff(row, col); }); storage_->apply([&](const auto& blk) { val = blk.maxCoeff(row, col); });

4
src/matrix_model.cpp
View file

@ -143,8 +143,8 @@ TYPE CLASSNAME::trace() const { return storage_->data.trace(); }
TYPE CLASSNAME::minCoeff() const { return storage_->data.minCoeff(); } TYPE CLASSNAME::minCoeff() const { return storage_->data.minCoeff(); }
TYPE CLASSNAME::maxCoeff() const { return storage_->data.maxCoeff(); } TYPE CLASSNAME::maxCoeff() const { return storage_->data.maxCoeff(); }
TYPE CLASSNAME::minCoeff(std::ptrdiff_t* row, std::ptrdiff_t* col) const { return storage_->data.minCoeff(row, col); } TYPE CLASSNAME::minCoeff(Index* row, Index* col) const { return storage_->data.minCoeff(row, col); }
TYPE CLASSNAME::maxCoeff(std::ptrdiff_t* row, std::ptrdiff_t* col) const { return storage_->data.maxCoeff(row, col); } TYPE CLASSNAME::maxCoeff(Index* row, Index* col) const { return storage_->data.maxCoeff(row, col); }
TYPE CLASSNAME::squaredNorm() const { return storage_->data.squaredNorm(); } TYPE CLASSNAME::squaredNorm() const { return storage_->data.squaredNorm(); }
TYPE CLASSNAME::norm() const { return storage_->data.norm(); } TYPE CLASSNAME::norm() const { return storage_->data.norm(); }

4
test/unit/common/arithmetic.hpp
View file

@ -100,7 +100,7 @@ namespace rotgen::tests
TTS_EQUAL(maxCoeff(input) , ref.maxCoeff()); TTS_EQUAL(maxCoeff(input) , ref.maxCoeff());
{ {
rotgen::Index row, col, ref_row, ref_col; int row, col, ref_row, ref_col;
TTS_EQUAL(input.minCoeff(&row, &col), ref.minCoeff(&ref_row, &ref_col)); TTS_EQUAL(input.minCoeff(&row, &col), ref.minCoeff(&ref_row, &ref_col));
TTS_EQUAL(row, ref_row); TTS_EQUAL(row, ref_row);
@ -112,7 +112,7 @@ namespace rotgen::tests
} }
{ {
rotgen::Index row, col, ref_row, ref_col; int row, col, ref_row, ref_col;
TTS_EQUAL(minCoeff(input,&row, &col), ref.minCoeff(&ref_row, &ref_col)); TTS_EQUAL(minCoeff(input,&row, &col), ref.minCoeff(&ref_row, &ref_col));
TTS_EQUAL(row, ref_row); TTS_EQUAL(row, ref_row);