devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug #86 : use internal:: namespace instead of ei_ prefix

Browse Source
This commit is contained in:
Benoit Jacob
2010-10-25 10:15:22 -04:00
parent ca85a1f6c5
commit 4716040703
330 changed files with 7615 additions and 7032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
Eigen/src/Jacobi/Jacobi.h
View File

@@ -29,7 +29,7 @@
/** \ingroup Jacobi_Module
* \jacobi_module
* \class JacobiRotation
* \brief Represents a rotation given by a cosine-sine pair.
* \brief Rotation given by a cosine-sine pair.
*
* This class represents a Jacobi or Givens rotation.
* This is a 2D rotation in the plane \c J of angle \f$ \theta \f$ defined by
@@ -63,15 +63,15 @@ template<typename Scalar> class JacobiRotation
/** Concatenates two planar rotation */
JacobiRotation operator*(const JacobiRotation& other)
{
return JacobiRotation(m_c * other.m_c - ei_conj(m_s) * other.m_s,
ei_conj(m_c * ei_conj(other.m_s) + ei_conj(m_s) * ei_conj(other.m_c)));
return JacobiRotation(m_c * other.m_c - internal::conj(m_s) * other.m_s,
internal::conj(m_c * internal::conj(other.m_s) + internal::conj(m_s) * internal::conj(other.m_c)));
}
/** Returns the transposed transformation */
JacobiRotation transpose() const { return JacobiRotation(m_c, -ei_conj(m_s)); }
JacobiRotation transpose() const { return JacobiRotation(m_c, -internal::conj(m_s)); }
/** Returns the adjoint transformation */
JacobiRotation adjoint() const { return JacobiRotation(ei_conj(m_c), -m_s); }
JacobiRotation adjoint() const { return JacobiRotation(internal::conj(m_c), -m_s); }
template<typename Derived>
bool makeJacobi(const MatrixBase<Derived>&, typename Derived::Index p, typename Derived::Index q);
@@ -80,8 +80,8 @@ template<typename Scalar> class JacobiRotation
void makeGivens(const Scalar& p, const Scalar& q, Scalar* z=0);
protected:
void makeGivens(const Scalar& p, const Scalar& q, Scalar* z, ei_meta_true);
void makeGivens(const Scalar& p, const Scalar& q, Scalar* z, ei_meta_false);
void makeGivens(const Scalar& p, const Scalar& q, Scalar* z, internal::meta_true);
void makeGivens(const Scalar& p, const Scalar& q, Scalar* z, internal::meta_false);
Scalar m_c, m_s;
};
@@ -103,8 +103,8 @@ bool JacobiRotation<Scalar>::makeJacobi(RealScalar x, Scalar y, RealScalar z)
}
else
{
RealScalar tau = (x-z)/(RealScalar(2)*ei_abs(y));
RealScalar w = ei_sqrt(ei_abs2(tau) + 1);
RealScalar tau = (x-z)/(RealScalar(2)*internal::abs(y));
RealScalar w = internal::sqrt(internal::abs2(tau) + 1);
RealScalar t;
if(tau>0)
{
@@ -115,8 +115,8 @@ bool JacobiRotation<Scalar>::makeJacobi(RealScalar x, Scalar y, RealScalar z)
t = RealScalar(1) / (tau - w);
}
RealScalar sign_t = t > 0 ? 1 : -1;
RealScalar n = RealScalar(1) / ei_sqrt(ei_abs2(t)+1);
m_s = - sign_t * (ei_conj(y) / ei_abs(y)) * ei_abs(t) * n;
RealScalar n = RealScalar(1) / internal::sqrt(internal::abs2(t)+1);
m_s = - sign_t * (internal::conj(y) / internal::abs(y)) * internal::abs(t) * n;
m_c = n;
return true;
}
@@ -135,7 +135,7 @@ template<typename Scalar>
template<typename Derived>
inline bool JacobiRotation<Scalar>::makeJacobi(const MatrixBase<Derived>& m, typename Derived::Index p, typename Derived::Index q)
{
return makeJacobi(ei_real(m.coeff(p,p)), m.coeff(p,q), ei_real(m.coeff(q,q)));
return makeJacobi(internal::real(m.coeff(p,p)), m.coeff(p,q), internal::real(m.coeff(q,q)));
}
/** Makes \c *this as a Givens rotation \c G such that applying \f$ G^* \f$ to the left of the vector
@@ -157,60 +157,60 @@ inline bool JacobiRotation<Scalar>::makeJacobi(const MatrixBase<Derived>& m, typ
template<typename Scalar>
void JacobiRotation<Scalar>::makeGivens(const Scalar& p, const Scalar& q, Scalar* z)
{
makeGivens(p, q, z, typename ei_meta_if<NumTraits<Scalar>::IsComplex, ei_meta_true, ei_meta_false>::ret());
makeGivens(p, q, z, typename internal::meta_if<NumTraits<Scalar>::IsComplex, internal::meta_true, internal::meta_false>::ret());
}
// specialization for complexes
template<typename Scalar>
void JacobiRotation<Scalar>::makeGivens(const Scalar& p, const Scalar& q, Scalar* r, ei_meta_true)
void JacobiRotation<Scalar>::makeGivens(const Scalar& p, const Scalar& q, Scalar* r, internal::meta_true)
{
if(q==Scalar(0))
{
m_c = ei_real(p)<0 ? Scalar(-1) : Scalar(1);
m_c = internal::real(p)<0 ? Scalar(-1) : Scalar(1);
m_s = 0;
if(r) *r = m_c * p;
}
else if(p==Scalar(0))
{
m_c = 0;
m_s = -q/ei_abs(q);
if(r) *r = ei_abs(q);
m_s = -q/internal::abs(q);
if(r) *r = internal::abs(q);
}
else
{
RealScalar p1 = ei_norm1(p);
RealScalar q1 = ei_norm1(q);
RealScalar p1 = internal::norm1(p);
RealScalar q1 = internal::norm1(q);
if(p1>=q1)
{
Scalar ps = p / p1;
RealScalar p2 = ei_abs2(ps);
RealScalar p2 = internal::abs2(ps);
Scalar qs = q / p1;
RealScalar q2 = ei_abs2(qs);
RealScalar q2 = internal::abs2(qs);
RealScalar u = ei_sqrt(RealScalar(1) + q2/p2);
if(ei_real(p)<RealScalar(0))
RealScalar u = internal::sqrt(RealScalar(1) + q2/p2);
if(internal::real(p)<RealScalar(0))
u = -u;
m_c = Scalar(1)/u;
m_s = -qs*ei_conj(ps)*(m_c/p2);
m_s = -qs*internal::conj(ps)*(m_c/p2);
if(r) *r = p * u;
}
else
{
Scalar ps = p / q1;
RealScalar p2 = ei_abs2(ps);
RealScalar p2 = internal::abs2(ps);
Scalar qs = q / q1;
RealScalar q2 = ei_abs2(qs);
RealScalar q2 = internal::abs2(qs);
RealScalar u = q1 * ei_sqrt(p2 + q2);
if(ei_real(p)<RealScalar(0))
RealScalar u = q1 * internal::sqrt(p2 + q2);
if(internal::real(p)<RealScalar(0))
u = -u;
p1 = ei_abs(p);
p1 = internal::abs(p);
ps = p/p1;
m_c = p1/u;
m_s = -ei_conj(ps) * (q/u);
m_s = -internal::conj(ps) * (q/u);
if(r) *r = ps * u;
}
}
@@ -218,25 +218,25 @@ void JacobiRotation<Scalar>::makeGivens(const Scalar& p, const Scalar& q, Scalar
// specialization for reals
template<typename Scalar>
void JacobiRotation<Scalar>::makeGivens(const Scalar& p, const Scalar& q, Scalar* r, ei_meta_false)
void JacobiRotation<Scalar>::makeGivens(const Scalar& p, const Scalar& q, Scalar* r, internal::meta_false)
{
if(q==0)
{
m_c = p<Scalar(0) ? Scalar(-1) : Scalar(1);
m_s = 0;
if(r) *r = ei_abs(p);
if(r) *r = internal::abs(p);
}
else if(p==0)
{
m_c = 0;
m_s = q<Scalar(0) ? Scalar(1) : Scalar(-1);
if(r) *r = ei_abs(q);
if(r) *r = internal::abs(q);
}
else if(ei_abs(p) > ei_abs(q))
else if(internal::abs(p) > internal::abs(q))
{
Scalar t = q/p;
Scalar u = ei_sqrt(Scalar(1) + ei_abs2(t));
Scalar u = internal::sqrt(Scalar(1) + internal::abs2(t));
if(p<Scalar(0))
u = -u;
m_c = Scalar(1)/u;
@@ -246,7 +246,7 @@ void JacobiRotation<Scalar>::makeGivens(const Scalar& p, const Scalar& q, Scalar
else
{
Scalar t = p/q;
Scalar u = ei_sqrt(Scalar(1) + ei_abs2(t));
Scalar u = internal::sqrt(Scalar(1) + internal::abs2(t));
if(q<Scalar(0))
u = -u;
m_s = -Scalar(1)/u;
@@ -266,14 +266,16 @@ void JacobiRotation<Scalar>::makeGivens(const Scalar& p, const Scalar& q, Scalar
*
* \sa MatrixBase::applyOnTheLeft(), MatrixBase::applyOnTheRight()
*/
namespace internal {
template<typename VectorX, typename VectorY, typename OtherScalar>
void ei_apply_rotation_in_the_plane(VectorX& _x, VectorY& _y, const JacobiRotation<OtherScalar>& j);
void apply_rotation_in_the_plane(VectorX& _x, VectorY& _y, const JacobiRotation<OtherScalar>& j);
}
/** \jacobi_module
* Applies the rotation in the plane \a j to the rows \a p and \a q of \c *this, i.e., it computes B = J * B,
* with \f$ B = \left ( \begin{array}{cc} \text{*this.row}(p) \\ \text{*this.row}(q) \end{array} \right ) \f$.
*
* \sa class JacobiRotation, MatrixBase::applyOnTheRight(), ei_apply_rotation_in_the_plane()
* \sa class JacobiRotation, MatrixBase::applyOnTheRight(), internal::apply_rotation_in_the_plane()
*/
template<typename Derived>
template<typename OtherScalar>
@@ -281,14 +283,14 @@ inline void MatrixBase<Derived>::applyOnTheLeft(Index p, Index q, const JacobiRo
{
RowXpr x(this->row(p));
RowXpr y(this->row(q));
ei_apply_rotation_in_the_plane(x, y, j);
internal::apply_rotation_in_the_plane(x, y, j);
}
/** \ingroup Jacobi_Module
* Applies the rotation in the plane \a j to the columns \a p and \a q of \c *this, i.e., it computes B = B * J
* with \f$ B = \left ( \begin{array}{cc} \text{*this.col}(p) & \text{*this.col}(q) \end{array} \right ) \f$.
*
* \sa class JacobiRotation, MatrixBase::applyOnTheLeft(), ei_apply_rotation_in_the_plane()
* \sa class JacobiRotation, MatrixBase::applyOnTheLeft(), internal::apply_rotation_in_the_plane()
*/
template<typename Derived>
template<typename OtherScalar>
@@ -296,18 +298,18 @@ inline void MatrixBase<Derived>::applyOnTheRight(Index p, Index q, const JacobiR
{
ColXpr x(this->col(p));
ColXpr y(this->col(q));
ei_apply_rotation_in_the_plane(x, y, j.transpose());
internal::apply_rotation_in_the_plane(x, y, j.transpose());
}
namespace internal {
template<typename VectorX, typename VectorY, typename OtherScalar>
void /*EIGEN_DONT_INLINE*/ ei_apply_rotation_in_the_plane(VectorX& _x, VectorY& _y, const JacobiRotation<OtherScalar>& j)
void /*EIGEN_DONT_INLINE*/ apply_rotation_in_the_plane(VectorX& _x, VectorY& _y, const JacobiRotation<OtherScalar>& j)
{
typedef typename VectorX::Index Index;
typedef typename VectorX::Scalar Scalar;
enum { PacketSize = ei_packet_traits<Scalar>::size };
typedef typename ei_packet_traits<Scalar>::type Packet;
ei_assert(_x.size() == _y.size());
enum { PacketSize = packet_traits<Scalar>::size };
typedef typename packet_traits<Scalar>::type Packet;
eigen_assert(_x.size() == _y.size());
Index size = _x.size();
Index incrx = _x.innerStride();
Index incry = _y.innerStride();
@@ -324,32 +326,32 @@ void /*EIGEN_DONT_INLINE*/ ei_apply_rotation_in_the_plane(VectorX& _x, VectorY&
// both vectors are sequentially stored in memory => vectorization
enum { Peeling = 2 };
Index alignedStart = ei_first_aligned(y, size);
Index alignedStart = first_aligned(y, size);
Index alignedEnd = alignedStart + ((size-alignedStart)/PacketSize)*PacketSize;
const Packet pc = ei_pset1<Packet>(j.c());
const Packet ps = ei_pset1<Packet>(j.s());
ei_conj_helper<Packet,Packet,NumTraits<Scalar>::IsComplex,false> pcj;
const Packet pc = pset1<Packet>(j.c());
const Packet ps = pset1<Packet>(j.s());
conj_helper<Packet,Packet,NumTraits<Scalar>::IsComplex,false> pcj;
for(Index i=0; i<alignedStart; ++i)
{
Scalar xi = x[i];
Scalar yi = y[i];
x[i] = j.c() * xi + ei_conj(j.s()) * yi;
y[i] = -j.s() * xi + ei_conj(j.c()) * yi;
x[i] = j.c() * xi + conj(j.s()) * yi;
y[i] = -j.s() * xi + conj(j.c()) * yi;
}
Scalar* EIGEN_RESTRICT px = x + alignedStart;
Scalar* EIGEN_RESTRICT py = y + alignedStart;
if(ei_first_aligned(x, size)==alignedStart)
if(first_aligned(x, size)==alignedStart)
{
for(Index i=alignedStart; i<alignedEnd; i+=PacketSize)
{
Packet xi = ei_pload<Packet>(px);
Packet yi = ei_pload<Packet>(py);
ei_pstore(px, ei_padd(ei_pmul(pc,xi),pcj.pmul(ps,yi)));
ei_pstore(py, ei_psub(pcj.pmul(pc,yi),ei_pmul(ps,xi)));
Packet xi = pload<Packet>(px);
Packet yi = pload<Packet>(py);
pstore(px, padd(pmul(pc,xi),pcj.pmul(ps,yi)));
pstore(py, psub(pcj.pmul(pc,yi),pmul(ps,xi)));
px += PacketSize;
py += PacketSize;
}
@@ -359,23 +361,23 @@ void /*EIGEN_DONT_INLINE*/ ei_apply_rotation_in_the_plane(VectorX& _x, VectorY&
Index peelingEnd = alignedStart + ((size-alignedStart)/(Peeling*PacketSize))*(Peeling*PacketSize);
for(Index i=alignedStart; i<peelingEnd; i+=Peeling*PacketSize)
{
Packet xi = ei_ploadu<Packet>(px);
Packet xi1 = ei_ploadu<Packet>(px+PacketSize);
Packet yi = ei_pload <Packet>(py);
Packet yi1 = ei_pload <Packet>(py+PacketSize);
ei_pstoreu(px, ei_padd(ei_pmul(pc,xi),pcj.pmul(ps,yi)));
ei_pstoreu(px+PacketSize, ei_padd(ei_pmul(pc,xi1),pcj.pmul(ps,yi1)));
ei_pstore (py, ei_psub(pcj.pmul(pc,yi),ei_pmul(ps,xi)));
ei_pstore (py+PacketSize, ei_psub(pcj.pmul(pc,yi1),ei_pmul(ps,xi1)));
Packet xi = ploadu<Packet>(px);
Packet xi1 = ploadu<Packet>(px+PacketSize);
Packet yi = pload <Packet>(py);
Packet yi1 = pload <Packet>(py+PacketSize);
pstoreu(px, padd(pmul(pc,xi),pcj.pmul(ps,yi)));
pstoreu(px+PacketSize, padd(pmul(pc,xi1),pcj.pmul(ps,yi1)));
pstore (py, psub(pcj.pmul(pc,yi),pmul(ps,xi)));
pstore (py+PacketSize, psub(pcj.pmul(pc,yi1),pmul(ps,xi1)));
px += Peeling*PacketSize;
py += Peeling*PacketSize;
}
if(alignedEnd!=peelingEnd)
{
Packet xi = ei_ploadu<Packet>(x+peelingEnd);
Packet yi = ei_pload <Packet>(y+peelingEnd);
ei_pstoreu(x+peelingEnd, ei_padd(ei_pmul(pc,xi),pcj.pmul(ps,yi)));
ei_pstore (y+peelingEnd, ei_psub(pcj.pmul(pc,yi),ei_pmul(ps,xi)));
Packet xi = ploadu<Packet>(x+peelingEnd);
Packet yi = pload <Packet>(y+peelingEnd);
pstoreu(x+peelingEnd, padd(pmul(pc,xi),pcj.pmul(ps,yi)));
pstore (y+peelingEnd, psub(pcj.pmul(pc,yi),pmul(ps,xi)));
}
}
@@ -383,8 +385,8 @@ void /*EIGEN_DONT_INLINE*/ ei_apply_rotation_in_the_plane(VectorX& _x, VectorY&
{
Scalar xi = x[i];
Scalar yi = y[i];
x[i] = j.c() * xi + ei_conj(j.s()) * yi;
y[i] = -j.s() * xi + ei_conj(j.c()) * yi;
x[i] = j.c() * xi + conj(j.s()) * yi;
y[i] = -j.s() * xi + conj(j.c()) * yi;
}
}
@@ -393,17 +395,17 @@ void /*EIGEN_DONT_INLINE*/ ei_apply_rotation_in_the_plane(VectorX& _x, VectorY&
(VectorX::Flags & VectorY::Flags & PacketAccessBit) &&
(VectorX::Flags & VectorY::Flags & AlignedBit))
{
const Packet pc = ei_pset1<Packet>(j.c());
const Packet ps = ei_pset1<Packet>(j.s());
ei_conj_helper<Packet,Packet,NumTraits<Scalar>::IsComplex,false> pcj;
const Packet pc = pset1<Packet>(j.c());
const Packet ps = pset1<Packet>(j.s());
conj_helper<Packet,Packet,NumTraits<Scalar>::IsComplex,false> pcj;
Scalar* EIGEN_RESTRICT px = x;
Scalar* EIGEN_RESTRICT py = y;
for(Index i=0; i<size; i+=PacketSize)
{
Packet xi = ei_pload<Packet>(px);
Packet yi = ei_pload<Packet>(py);
ei_pstore(px, ei_padd(ei_pmul(pc,xi),pcj.pmul(ps,yi)));
ei_pstore(py, ei_psub(pcj.pmul(pc,yi),ei_pmul(ps,xi)));
Packet xi = pload<Packet>(px);
Packet yi = pload<Packet>(py);
pstore(px, padd(pmul(pc,xi),pcj.pmul(ps,yi)));
pstore(py, psub(pcj.pmul(pc,yi),pmul(ps,xi)));
px += PacketSize;
py += PacketSize;
}
@@ -416,12 +418,13 @@ void /*EIGEN_DONT_INLINE*/ ei_apply_rotation_in_the_plane(VectorX& _x, VectorY&
{
Scalar xi = *x;
Scalar yi = *y;
*x = j.c() * xi + ei_conj(j.s()) * yi;
*y = -j.s() * xi + ei_conj(j.c()) * yi;
*x = j.c() * xi + conj(j.s()) * yi;
*y = -j.s() * xi + conj(j.c()) * yi;
x += incrx;
y += incry;
}
}
}
}
#endif // EIGEN_JACOBI_H