Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Basic.h : add member function derived() #54

Merged
merged 2 commits into from
Aug 9, 2023
Merged

Basic.h : add member function derived() #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9956679
Basic.h : add member function derived(), returns reference to derived…
ManifoldFR Jul 17, 2023
8aa0452
MvNormal.h : refactor compile-time dims check, allow for Dynamic and …
ManifoldFR Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 37 additions & 12 deletions EigenRand/Dists/Basic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ namespace Eigen
class GenBase
{
public:
/**
* @brief Return a reference to the derived type.
*/
DerivedGen &derived() { return static_cast<DerivedGen &>(*this); }

/**
* @brief generate random values from its distribution
*
Expand All @@ -48,7 +53,7 @@ namespace Eigen
generate(Index rows, Index cols, Urng&& urng)
{
return {
rows, cols, { std::forward<Urng>(urng), static_cast<DerivedGen&>(*this) }
rows, cols, { std::forward<Urng>(urng), derived() }
};
}

Expand All @@ -67,7 +72,7 @@ namespace Eigen
generateLike(const Derived& o, Urng&& urng)
{
return {
o.rows(), o.cols(), { std::forward<Urng>(urng), static_cast<DerivedGen&>(*this) }
o.rows(), o.cols(), { std::forward<Urng>(urng), derived() }
};
}
};
Expand All @@ -76,6 +81,11 @@ namespace Eigen
class UnaryGenBase
{
public:
/**
* @brief Return a reference to the derived type.
*/
DerivedGen &derived() { return static_cast<DerivedGen &>(*this); }

/**
* @brief generate random values from its distribution
*
Expand All @@ -93,7 +103,7 @@ namespace Eigen
> generate(Urng&& urng, const ArrayBase<Lhs>& a)
{
return {
a, { std::forward<Urng>(urng), static_cast<DerivedGen&>(*this) }
a, { std::forward<Urng>(urng), derived() }
};
}
};
Expand All @@ -102,6 +112,11 @@ namespace Eigen
class BinaryGenBase
{
public:
/**
* @brief Return a reference to the derived type.
*/
DerivedGen &derived() { return static_cast<DerivedGen &>(*this); }

/**
* @brief generate random values from its distribution
*
Expand All @@ -119,7 +134,7 @@ namespace Eigen
> generate(Urng&& urng, const ArrayBase<Lhs>& a, const ArrayBase<Rhs>& b)
{
return {
a, b, { std::forward<Urng>(urng), static_cast<DerivedGen&>(*this) }
a, b, { std::forward<Urng>(urng), derived() }
};
}

Expand All @@ -131,7 +146,7 @@ namespace Eigen
{
return {
a, { a.rows(), a.cols(), internal::scalar_constant_op<Rhs>{ b } },
{ std::forward<Urng>(urng), static_cast<DerivedGen&>(*this) }
{ std::forward<Urng>(urng), derived() }
};
}

Expand All @@ -143,7 +158,7 @@ namespace Eigen
{
return {
{ b.rows(), b.cols(), internal::scalar_constant_op<Lhs>{ a } }, b,
{ std::forward<Urng>(urng), static_cast<DerivedGen&>(*this) }
{ std::forward<Urng>(urng), derived() }
};
}
};
Expand All @@ -159,10 +174,15 @@ namespace Eigen
class MvVecGenBase
{
public:
/**
* @brief Return a reference to the derived type.
*/
DerivedGen &derived() { return static_cast<DerivedGen &>(*this); }

/**
* @brief returns the dimensions of vectors to be generated
*/
Index dims() const { return static_cast<DerivedGen&>(*this).dims(); }
Index dims() const { return derived().dims(); }

/**
* @brief generates multiple samples at once
Expand All @@ -176,7 +196,7 @@ namespace Eigen
template<typename Urng>
inline Matrix<_Scalar, Dim, -1> generate(Urng&& urng, Index samples)
{
return static_cast<DerivedGen&>(*this).generatr(std::forward<Urng>(urng), samples);
return derived().generate(std::forward<Urng>(urng), samples);
}

/**
Expand All @@ -189,7 +209,7 @@ namespace Eigen
template<typename Urng>
inline Matrix<_Scalar, Dim, 1> generate(Urng&& urng)
{
return static_cast<DerivedGen&>(*this).generatr(std::forward<Urng>(urng));
return derived().generate(std::forward<Urng>(urng));
}
};

Expand All @@ -204,10 +224,15 @@ namespace Eigen
class MvMatGenBase
{
public:
/**
* @brief Return a reference to the derived type.
*/
DerivedGen &derived() { return static_cast<DerivedGen &>(*this); }

/**
* @brief returns the dimensions of matrices to be generated
*/
Index dims() const { return static_cast<DerivedGen&>(*this).dims(); }
Index dims() const { return derived().dims(); }

/**
* @brief generates multiple samples at once
Expand All @@ -221,7 +246,7 @@ namespace Eigen
template<typename Urng>
inline Matrix<_Scalar, Dim, -1> generate(Urng&& urng, Index samples)
{
return static_cast<DerivedGen&>(*this).generate(std::forward<Urng>(urng), samples);
return derived().generate(std::forward<Urng>(urng), samples);
}

/**
Expand All @@ -234,7 +259,7 @@ namespace Eigen
template<typename Urng>
inline Matrix<_Scalar, Dim, Dim> generate(Urng&& urng)
{
return static_cast<DerivedGen&>(*this).generate(std::forward<Urng>(urng));
return derived().generate(std::forward<Urng>(urng));
}
};

Expand Down
20 changes: 16 additions & 4 deletions EigenRand/MvDists/MvNormal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,20 @@ namespace Eigen
}
};

namespace detail {
template<typename MeanTy, typename CovTy>
constexpr bool either_is_dynamic() {
return (MatrixBase<MeanTy>::RowsAtCompileTime == Eigen::Dynamic) ||
(MatrixBase<CovTy>::RowsAtCompileTime == Eigen::Dynamic);
}

template<typename MeanTy, typename CovTy>
constexpr bool normal_check_dims() {
return (either_is_dynamic<MeanTy, CovTy>() || MatrixBase<MeanTy>::RowsAtCompileTime == MatrixBase<CovTy>::RowsAtCompileTime) &&
MatrixBase<CovTy>::RowsAtCompileTime == MatrixBase<CovTy>::ColsAtCompileTime;
}
}

/**
* @brief helper function constructing Eigen::Rand::MvNormal
*
Expand All @@ -132,8 +146,7 @@ namespace Eigen
"Derived::Scalar must be the same with `mean` and `cov`'s Scalar."
);
static_assert(
MatrixBase<MeanTy>::RowsAtCompileTime == MatrixBase<CovTy>::RowsAtCompileTime &&
MatrixBase<CovTy>::RowsAtCompileTime == MatrixBase<CovTy>::ColsAtCompileTime,
detail::normal_check_dims<MeanTy, CovTy>(),
"assert: mean.RowsAtCompileTime == cov.RowsAtCompileTime && cov.RowsAtCompileTime == cov.ColsAtCompileTime"
);
return { mean, cov };
Expand All @@ -156,8 +169,7 @@ namespace Eigen
"Derived::Scalar must be the same with `mean` and `lt`'s Scalar."
);
static_assert(
MatrixBase<MeanTy>::RowsAtCompileTime == MatrixBase<LTTy>::RowsAtCompileTime &&
MatrixBase<LTTy>::RowsAtCompileTime == MatrixBase<LTTy>::ColsAtCompileTime,
detail::normal_check_dims<MeanTy, LTTy>(),
"assert: mean.RowsAtCompileTime == lt.RowsAtCompileTime && lt.RowsAtCompileTime == lt.ColsAtCompileTime"
);
return { mean, lt, lower_triangular };
Expand Down